Changeset 481 for trunk/src/sh_getopt.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_getopt.c (modified) (7 diffs)

trunk/src/sh_getopt.c

@@ -34 +34 @@
 #include "sh_utils.h"
 #include "sh_mail.h"
-#include "sh_forward.h"
+#include "sh_xfer.h"
 #include "sh_hash.h"
+#include "sh_dbIO.h"
+#include "sh_dbCheck.h"
+#include "sh_dbCreate.h"
+#include "sh_sem.h"
 
 #if defined(WITH_EXTERNAL)
@@ -64 +68 @@
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
 static int sh_getopt_forever (const char * dummy);
+static int sh_getopt_outpath (const char * dummy);
 #endif
 static int sh_getopt_copyright (const char * dummy);
@@ -92 +97 @@
     N_("Set the server port to connect to"),  
     HAS_ARG_YES, 
-    sh_forward_server_port },
+    sh_xfer_server_port },
   { N_("server-host"),  
     '-', 
     N_("Set the server host to connect to"),  
     HAS_ARG_YES, 
-    sh_forward_setlogserver },
+    sh_xfer_set_logserver },
 #endif
 #ifdef SH_WITH_SERVER
@@ -109 +114 @@
     N_("Log fully qualified name of client host"),  
     HAS_ARG_NO, 
-    sh_forward_set_strip },
+    sh_xfer_set_strip },
   { N_("chroot"),  
     '-', 
@@ -222 +227 @@
     N_("Compute a client registry entry for password"),  
     HAS_ARG_YES, 
-    sh_forward_make_client },
+    sh_xfer_make_client },
   { N_("gen-password"),  
     'G', 
     N_("Generate a random password"),  
     HAS_ARG_NO, 
-    sh_forward_create_password },
+    sh_xfer_create_password },
 #endif
 
@@ -236 +241 @@
     HAS_ARG_NO, 
     sh_getopt_forever},
+  { N_("outfile"),  
+    'o', 
+    N_("Pathname for output file"),  
+    HAS_ARG_YES, 
+    sh_getopt_outpath},
   { N_("list-file"),  
     '-', 
-    N_("Modify -d to list content of a single file"),  
+    N_("Modify -d to show content of a single file"),  
     HAS_ARG_YES, 
     set_list_file},
+  { N_("list-filter"),  
+    '-', 
+    N_("Modify -d to filter by file list given in text file"),  
+    HAS_ARG_YES, 
+    sh_dbIO_list_filter},
   { N_("full-detail"),  
     'a', 
-    N_("Modify -d to list full details"),  
+    N_("Modify -d to show full details"),  
     HAS_ARG_NO, 
     set_full_detail},
   { N_("delimited"),  
     '-', 
-    N_("Modify -d to list full details, comma delimited"),  
+    N_("Modify -d to show full details, comma delimited"),  
     HAS_ARG_NO, 
     set_list_delimited},
+  { N_("binary"),  
+    '-', 
+    N_("Modify -d to output in binary database format"),  
+    HAS_ARG_NO, 
+    sh_dbIO_list_binary},
   { N_("list-database"),  
     'd', 
     N_("List database content (like ls -l)"),  
     HAS_ARG_YES, 
-    sh_hash_list_db},
+    sh_dbIO_list_db},
   { N_("init2stdout"),  
     '-', 
     N_("Write database to stdout on init"),  
     HAS_ARG_NO, 
-    sh_hash_pushdata_stdout},
+    sh_dbIO_writeout_stdout},
+  { N_("verify-database"),  
+    '-', 
+    N_("Verify the given database"),  
+    HAS_ARG_YES, 
+    sh_dbCheck_verify},
+  { N_("create-database"),  
+    '-', 
+    N_("Create database from file list"),  
+    HAS_ARG_YES, 
+    sh_dbCreate},
+  { N_("wait-on-check"),  
+    'w', 
+    N_("Timed wait for end of filecheck (0 for no timeout)"),  
+    HAS_ARG_YES, 
+    sh_sem_wait},
 #endif
   { N_("trace-logfile"),  
@@ -744 +779 @@
   sh.flag.loop = S_TRUE;
   SL_RETURN(0, _("sh_getopt_forever"));
+}
+
+static int sh_getopt_outpath (const char * str)
+{
+  if (str)
+    {
+      if (sh.outpath)
+        SH_FREE(sh.outpath);
+      sh.outpath = sh_util_strdup(str);
+      return 0;
+    }
+  return -1;
 }
 #endif