Changeset 29 for trunk/src/sh_utils.c

Timestamp:

Apr 11, 2006, 1:48:18 PM (18 years ago)

Author:

rainer

Message:

Fixes for test suite, OpenBSD portability, self-resolving, and suidchk patch by Neil

File:

• trunk/src/sh_utils.c (modified) (6 diffs)

trunk/src/sh_utils.c

@@ -1340 +1340 @@
   char * endptr = NULL;
 
-  SL_ENTER(_("sh_util_obscure_ex"));
+  SL_ENTER(_("sh_util_obscure_ok"));
 
   if (0 == sl_strncmp("all", str, 3))
@@ -1348 +1348 @@
           sh_obscure_index[i] = (unsigned char)1;
         }
-      SL_RETURN(0, _("sh_util_obscure_ex"));
+      SL_RETURN(0, _("sh_util_obscure_ok"));
     }
 
@@ -1359 +1359 @@
   if (i > 255)
     {
-      SL_RETURN(-1, _("sh_util_obscure_ex"));
+      SL_RETURN(-1, _("sh_util_obscure_ok"));
     }
   sh_obscure_index[i] = (unsigned char)1;
@@ -1370 +1370 @@
       if (i > 255)
         {
-          SL_RETURN(-1, _("sh_util_obscure_ex"));
+          SL_RETURN(-1, _("sh_util_obscure_ok"));
         }
       sh_obscure_index[i] = (unsigned char)1;
@@ -1376 +1376 @@
         ++endptr;
     }
-  SL_RETURN(0, _("sh_util_obscure_ex"));
+  SL_RETURN(0, _("sh_util_obscure_ok"));
 }
 
 int sh_util_obscurename (ShErrLevel level, char * name_orig, int flag)
 {
-  char * name = name_orig;
+  unsigned char * name = (unsigned char *) name_orig;
   char * safe;
   unsigned int i;
@@ -1393 +1393 @@
   while (*name != '\0') 
     {
-      if ( (*name) == '"'  || (*name) == '\t' ||
+      if ( (*name) >  0x7F || (*name) == '"'  || (*name) == '\t' ||
            (*name) == '\b' || (*name) == '\f' || 
            (*name) == '\n' || (*name) == '\r' ||