Changeset 7756 for lang/c

Timestamp:

03/10/08 16:34:23 (5 years ago)

Author:

frsyuki

Message:

lang/c/partty: added --with-shell configure option

Location:

lang/c/partty/trunk

Files:

• cmd_host.cc (modified) (4 diffs)
• configure.in (modified) (2 diffs)
• server.cc (modified) (1 diff)

lang/c/partty/trunk/cmd_host.cc

@@ -20 +20 @@
         }
 }
+
+static char* fallback_shell[3];
 
 void usage(void)
@@ -48 +50 @@
 };
 
-}
+struct parse_end_exception {};
+struct parse_end {
+        unsigned int operator() (int argc, char* argv[]) {
+                throw parse_end_exception();
+        }
+};
+
+}  // noname namespace
 
 int main(int argc, char* argv[])
 {
+        {
+                fallback_shell[0] = getenv("SHELL");
+                if(!fallback_shell[0]) {
+#ifdef FALLBACK_SHELL
+                        fallback_shell[0] = FALLBACK_SHELL;
+                        fallback_shell[1] = NULL;
+#else
+                        fallback_shell[0] = "/bin/sh";
+                        fallback_shell[1] = "-i";
+                        fallback_shell[2] = NULL;
+#endif
+                }
+        }
+
         std::string session_name;
         std::string message;
@@ -77 +100 @@
                 kz.on("-c", "--lock",      Accept::Character(lock_char), lock_char_set);
                 kz.on("-h", "--help",      Accept::Action(usage_action()));
-                kz.break_parse(argc, argv);  // parse!
+                kz.on("--", "",            Accept::Action(parse_end()));
+                try {
+                        kz.break_parse(argc, argv);  // parse!
+                } catch (parse_end_exception& e) { }
 
                 if( argc < 1 ) {
@@ -187 +213 @@
                         return host.run(argv);
                 } else {
-                        return host.run(NULL);
+                        return host.run(fallback_shell);
                 }
         } catch (Partty::partty_error& e) {

lang/c/partty/trunk/configure.in

@@ -2 +2 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.61)
-AC_INIT(partty, 0.2.8, fr _at_ syuki.skr.jp)
-AM_INIT_AUTOMAKE(partty, 0.2.8)
+AC_PREREQ(2.59)
+AC_INIT(partty, 0.2.9, fr _at_ syuki.skr.jp)
+AM_INIT_AUTOMAKE(partty, 0.2.9)
 AC_CONFIG_SRCDIR(partty.h)
 AC_CONFIG_HEADER(config.h)
@@ -21 +21 @@
         AC_CHECK_HEADERS(util.h)
 fi
+
+AC_ARG_WITH([shell],
+            AS_HELP_STRING([--with-shell=shell],
+                           [path to fallback shell if SHELL environment variable is not available [[/bin/sh]]]),
+            [with_shell=$withval], [with_shell=/bin/sh])
+
+if test -z "$with_shell" ; then
+        with_shell=/bin/sh
+fi
+AC_DEFINE_UNQUOTED([FALLBACK_SHELL], ["$with_shell"], [fallback shell if SHELL environment variable is not available])
 
 # Checks for header files.

lang/c/partty/trunk/server.cc

@@ -342 +342 @@
         memcpy(gate_path + gate_dir_len, info.session_name, info.session_name_length);
         gate_path[gate_dir_len + info.session_name_length] = '\0';
-                                std::cerr << "gate: '";
-                                std::cerr.write(info.session_name, info.session_name_length);
-                                std::cerr << "'" << std::endl;
-                                std::cerr << "s name len: " << info.session_name_length << std::endl;
-                                std::cerr << gate_path << std::endl;
 
         int fd = info.fd;