Changeset 20 for trunk/src/sh_utils.c

Timestamp:

Feb 13, 2006, 11:54:42 PM (19 years ago)

Author:

rainer

Message:

Enable command-line parsing for prelude, and make prelude regression test safer.

File:

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

trunk/src/sh_utils.c

@@ -51 +51 @@
 UINT32 ErrFlag[2];
 
-int sh_util_flagval(char * c, int * fval)
+int sh_util_flagval(const char * c, int * fval)
 {
   SL_ENTER(_("sh_util_flagval"));
@@ -101 +101 @@
 static int sh_ask_update = S_FALSE;
 
-int sh_util_set_interactive(char * str)
-{
-  if (str == NULL)
-    sh_ask_update = S_TRUE;
-  else
-    sh_ask_update = S_TRUE;
+int sh_util_set_interactive(const char * str)
+{
+  (void) str;
+
+  sh_ask_update = S_TRUE;
 
   sh_unix_setnodeamon(NULL);
@@ -950 +949 @@
 static void copy_four (unsigned char * dest, UINT32 in);
 
-int sh_util_set_newkey (char * new)
+int sh_util_set_newkey (const char * new_in)
 {
   size_t i, j = 0;
@@ -964 +963 @@
   long ii, k = 0;
   UINT32    * h1;
+  char * new;
 
   if (0 != sl_is_suid())
@@ -973 +973 @@
     }
         
-  if (new == NULL || new[0] == '\0')
+  if (new_in == NULL || new_in[0] == '\0')
     {
       fprintf(stderr, 
@@ -981 +981 @@
       return -1;
     }
+
+  if (NULL == (new = malloc(strlen(new_in) + 1)))
+    goto bail_mem;
+  sl_strncpy(new, new_in, strlen(new_in) + 1);
+
   key = new;
   len = strlen(new);
@@ -1158 +1163 @@
 /* server mode 
  */
-int sh_util_setserver (char * dummy)
+int sh_util_setserver (const char * dummy)
 {
   SL_ENTER(_("sh_util_setserver"));
 
-  if (dummy)
-    sh.flag.isserver = GOOD;
-  else
-    sh.flag.isserver = GOOD;
+  (void) dummy;
+  sh.flag.isserver = GOOD;
   SL_RETURN((0),_("sh_util_setserver"));
 }
 
 
-int sh_util_setlooptime (char * str)
+int sh_util_setlooptime (const char * str)
 {
   int i = atoi (str);
@@ -1187 +1190 @@
 
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE)
-int  sh_util_setchecksum (char * str)
+int  sh_util_setchecksum (const char * str)
 {
   static int reject = 0;