Changeset 88

Timestamp:

03/06/07 20:35:18 (18 years ago)

Author:

tim

Message:

Fixed a lazy NULL printing to work properly on Solaris.

Switched reglookup exit codes to more standard ones.

Changed Makefile to default to using -liconv except on Linux, since Solaris needs this too.

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• src/reglookup.c (modified) (17 diffs)

trunk/Makefile

@@ -11 +11 @@
 
 CC=gcc
-OPTS=-std=gnu89 -pedantic -Wall -ggdb
+OPTS=-std=gnu89 -pedantic -Wall
 INC=-I/usr/local/include
 LIB=-L/usr/local/lib
 
 UNAME := $(shell uname)
-ifeq ($(UNAME),FreeBSD)         
+ifneq ($(UNAME),Linux)  
   LIB:=$(LIB) -liconv
 endif

trunk/src/reglookup.c

@@ -24 +24 @@
 
 #include <stdlib.h>
+#include <sysexits.h>
 #include <stdio.h>
 #include <string.h>
@@ -409 +410 @@
       copy = (char*)malloc((next-cur+1)*sizeof(char));
       if(copy == NULL)
-        bailOut(2, "ERROR: Memory allocation problem.\n");
+        bailOut(EX_OSERR, "ERROR: Memory allocation problem.\n");
           
       memcpy(copy, cur, next-cur);
@@ -417 +418 @@
         ret_val[ret_cur] = NULL;
       else
-        bailOut(2, "ERROR: Registry maximum depth exceeded.\n");
+        bailOut(EX_DATAERR, "ERROR: Registry maximum depth exceeded.\n");
     }
     cur = next+1;
@@ -430 +431 @@
       ret_val[ret_cur] = NULL;
     else
-      bailOut(2, "ERROR: Registry maximum depth exceeded.\n");
+      bailOut(EX_DATAERR, "ERROR: Registry maximum depth exceeded.\n");
   }
 
@@ -575 +576 @@
    */
   quoted_name = quote_string(vk->valuename, common_special_chars);
+  if (quoted_name == NULL)
+  {
+    quoted_name = malloc(1*sizeof(char));
+    if(quoted_name == NULL)
+      bailOut(EX_OSERR, "ERROR: Could not allocate sufficient memory.\n");
+    quoted_name[0] = '\0';
+  }
 
   if(quoted_value == NULL)
@@ -693 +701 @@
   
   if(root == NULL)
-    bailOut(3, "ERROR: root cannot be NULL.\n");
+    bailOut(EX_DATAERR, "ERROR: root cannot be NULL.\n");
   
   do
@@ -701 +709 @@
       path = iter2Path(iter);
       if(path == NULL)
-        bailOut(2, "ERROR: Could not construct iterator's path.\n");
+        bailOut(EX_OSERR, "ERROR: Could not construct iterator's path.\n");
       
       if(!type_filter_enabled || (key_type == type_filter))
@@ -717 +725 @@
         /* We're done with this sub-tree, going up and hitting other branches. */
         if(!regfi_iterator_up(iter))
-          bailOut(3, "ERROR: could not traverse iterator upward.\n");
+          bailOut(EX_DATAERR, "ERROR: could not traverse iterator upward.\n");
         
         cur = regfi_iterator_cur_key(iter);
         if(cur == NULL)
-          bailOut(3, "ERROR: unexpected NULL for key.\n");
+          bailOut(EX_DATAERR, "ERROR: unexpected NULL for key.\n");
         
         sub = regfi_iterator_next_subkey(iter);
@@ -732 +740 @@
        */
       if(!regfi_iterator_down(iter))
-        bailOut(3, "ERROR: could not traverse iterator downward.\n");
+        bailOut(EX_DATAERR, "ERROR: could not traverse iterator downward.\n");
 
       cur = sub;
@@ -802 +810 @@
 
     if((value == NULL) || (tmp_path_joined == NULL))
-      bailOut(2, "ERROR: Unexpected error before printValue.\n");
+      bailOut(EX_OSERR, "ERROR: Unexpected error before printValue.\n");
 
     printValue(value, tmp_path_joined);
@@ -816 +824 @@
 
     if(!regfi_iterator_down(iter))
-      bailOut(2, "ERROR: Unexpected error on traversing path filter key.\n");
+      bailOut(EX_DATAERR, "ERROR: Unexpected error on traversing path filter key.\n");
 
     return 2;
@@ -858 +866 @@
   {
     usage();
-    bailOut(1, "ERROR: Requires at least one argument.\n");
+    bailOut(EX_USAGE, "ERROR: Requires at least one argument.\n");
   }
   
@@ -869 +877 @@
       {
         usage();
-        bailOut(1, "ERROR: '-p' option requires parameter.\n");
+        bailOut(EX_USAGE, "ERROR: '-p' option requires parameter.\n");
       }
       if((path_filter = strdup(argv[argi])) == NULL)
-        bailOut(2, "ERROR: Memory allocation problem.\n");
+        bailOut(EX_OSERR, "ERROR: Memory allocation problem.\n");
 
       path_filter_enabled = true;
@@ -881 +889 @@
       {
         usage();
-        bailOut(1, "ERROR: '-t' option requires parameter.\n");
+        bailOut(EX_USAGE, "ERROR: '-t' option requires parameter.\n");
       }
       if((type_filter = regfi_type_str2val(argv[argi])) < 0)
       {
         fprintf(stderr, "ERROR: Invalid type specified: %s.\n", argv[argi]);
-        bailOut(1, "");
+        bailOut(EX_USAGE, "");
       }
       type_filter_enabled = true;
@@ -904 +912 @@
       usage();
       fprintf(stderr, "ERROR: Unrecognized option: %s\n", argv[argi]);
-      bailOut(1, "");
+      bailOut(EX_USAGE, "");
     }
   }
   if((registry_file = strdup(argv[argi])) == NULL)
-    bailOut(2, "ERROR: Memory allocation problem.\n");
+    bailOut(EX_OSERR, "ERROR: Memory allocation problem.\n");
 
   f = regfi_open(registry_file);
@@ -914 +922 @@
   {
     fprintf(stderr, "ERROR: Couldn't open registry file: %s\n", registry_file);
-    bailOut(3, "");
+    bailOut(EX_NOINPUT, "");
   }
 
   iter = regfi_iterator_new(f);
   if(iter == NULL)
-    bailOut(3, "ERROR: Couldn't create registry iterator.\n");
+    bailOut(EX_OSERR, "ERROR: Couldn't create registry iterator.\n");
 
   if(print_header)
@@ -942 +950 @@
       printKeyTree(iter);
     else if(retr_path_ret != 0)
-      bailOut(4, "ERROR: Unknown error occurred in retrieving path.\n");
+      bailOut(EX_DATAERR, "ERROR: Unknown error occurred in retrieving path.\n");
   }
   else