From 334bf12292dc2db5be845f2ec906d12a8400d2c2 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 29 May 2021 12:15:50 +0200
Subject: [PATCH] added missing CAP_COMMANDLINE guards, and other fixes for
 non-CAP_COMMANDLINE

---
 binary-tiling.cpp | 4 +++-
 commandline.cpp   | 6 +++---
 legacy.cpp        | 2 ++
 screenshot.cpp    | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/binary-tiling.cpp b/binary-tiling.cpp
index 871dfc47..2ffcc73e 100644
--- a/binary-tiling.cpp
+++ b/binary-tiling.cpp
@@ -865,8 +865,10 @@ EX namespace bt {
     ld co = vid.binary_width / log(2) / 8;
     return point3(log(2) + log(-h[0]), h[1] / co, h[2] / co);
     }
-  
+
+#if CAP_COMMANDLINE  
 auto bt_config = arg::add2("-btwidth", [] {arg::shift_arg_formula(vid.binary_width); });
+#endif
 
 EX bool pseudohept(cell *c) {
   if(WDIM == 2)
diff --git a/commandline.cpp b/commandline.cpp
index 454c454e..ec90b7f8 100644
--- a/commandline.cpp
+++ b/commandline.cpp
@@ -428,9 +428,9 @@ EX }
 
 #if !CAP_COMMANDLINE
 EX namespace arg {
-  EX int add1(const string& s, const reaction_t& r) { }
-  EX int add2(const string& s, const reaction_t& r) { }
-  EX int add3(const string& s, const reaction_t& r) { }
+  EX int add1(const string& s, const reaction_t& r) { return 0; }
+  EX int add2(const string& s, const reaction_t& r) { return 0; }
+  EX int add3(const string& s, const reaction_t& r) { return 0; }
 EX }
 #endif
 }
diff --git a/legacy.cpp b/legacy.cpp
index d872ff3e..06314b2b 100644
--- a/legacy.cpp
+++ b/legacy.cpp
@@ -238,6 +238,7 @@ EX modecode_t legacy_modecode() {
   return mct;
   }
 
+#if CAP_COMMANDLINE
 /* legacy options */
 int read_legacy_args() {
   using namespace arg;
@@ -272,6 +273,7 @@ int read_legacy_args() {
   }
 
 auto ah_legacy = addHook(hooks_args, 0, read_legacy_args);
+#endif
 
 
 }
diff --git a/screenshot.cpp b/screenshot.cpp
index 59555a62..86a1b73a 100644
--- a/screenshot.cpp
+++ b/screenshot.cpp
@@ -1807,7 +1807,7 @@ auto animhook = addHook(hooks_frame, 100, display_animation)
   #if CAP_COMMANDLINE
   + addHook(hooks_args, 100, readArgs)
   #endif
-  + addHook(hooks_config, 100, [] {
+  + addHook(hooks_configfile, 100, [] {
     #if CAP_CONFIG
     param_f(anims::period, "aperiod", "animation period");
     addsaver(anims::noframes, "animation frames");