Changeset 44

Timestamp:

08/06/05 09:47:07 (19 years ago)

Author:

tim

Message:

minor changes to command line option parsing

fixed some warnings with quote_string

File:

• trunk/src/reglookup.c (modified) (8 diffs)

trunk/src/reglookup.c

@@ -58 +58 @@
  */
 static char* quote_buffer(const unsigned char* str, 
-                          unsigned int len, char* special)
+                          unsigned int len, const char* special)
 {
   unsigned int i;
@@ -94 +94 @@
  * character.
  */
-static char* quote_string(const char* str, char* special)
+static char* quote_string(const char* str, const char* special)
 {
   unsigned int len;
@@ -785 +785 @@
   fprintf(stderr, "Options:\n");
   fprintf(stderr, "\t-v\t sets verbose mode.\n");
-  fprintf(stderr, "\t-s\t prints security descriptors.\n");
+  fprintf(stderr, "\t-s\t enables security descriptor output.\n");
+  fprintf(stderr, "\t-S\t disables security descriptor output. (default)\n");
   fprintf(stderr, "\t-p\t restrict output to elements below this path.\n");
   fprintf(stderr, "\t-t\t restrict results to this specific data type.\n");
@@ -799 +800 @@
   REGF_NK_REC* root;
   int retr_path_ret;
-  uint32 argi;
+  uint32 argi, arge;
 
   /* Process command line arguments */
@@ -805 +806 @@
   {
     usage();
-    bailOut(1, "ERROR: Requires 1 argument.\n");
+    bailOut(1, "ERROR: Requires at least one argument.\n");
   }
   
-  for(argi = 1; argi < argc; argi++)
+  arge = argc-1;
+  for(argi = 1; argi < arge; argi++)
   {
     if (strcmp("-p", argv[argi]) == 0)
     {
-      if(++argi > argc)
+      if(++argi >= arge)
       {
         usage();
@@ -824 +826 @@
     else if (strcmp("-t", argv[argi]) == 0)
     {
-      if(++argi > argc)
+      if(++argi >= arge)
       {
         usage();
@@ -839 +841 @@
     else if (strcmp("-s", argv[argi]) == 0)
       print_security = true;
+    else if (strcmp("-S", argv[argi]) == 0)
+      print_security = false;
     else if (strcmp("-v", argv[argi]) == 0)
       print_verbose = true;
-    else if (argv[argi][0] == '-')
+    else
     {
       usage();
@@ -847 +851 @@
       bailOut(1, "");
     }
-    else
-    {
-      if((registry_file = strdup(argv[argi])) == NULL)
-        bailOut(2, "ERROR: Memory allocation problem.\n");
-    }
-  }
+  }
+  if((registry_file = strdup(argv[argi])) == NULL)
+    bailOut(2, "ERROR: Memory allocation problem.\n");
 
   f = regfio_open(registry_file);