Changeset 27611 for trunk/Ohana/src/opihi

Timestamp:

Apr 5, 2010, 3:47:36 PM (16 years ago)

Author:

eugene

Message:

pendatic checking fscan, system, and mkstemp return values

Location:

trunk/Ohana/src/opihi

Files:

• cmd.astro/flux.c (modified) (1 diff)
• cmd.basic/help.c (modified) (1 diff)
• cmd.basic/list_help.c (modified) (1 diff)
• cmd.data/queuedrop.c (modified) (1 diff)
• dvo/elixir.c (modified) (1 diff)
• lib.shell/interrupt.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.astro/flux.c

@@ -29 +29 @@
   ymax = 0;
   for (i = 0; i < 4; i++) {
-    fscanf (f, "%lf %lf", &x[i], &y[i]);
+    if (fscanf (f, "%lf %lf", &x[i], &y[i]) != 2) {
+      fprintf (stderr, "error reading coordinates from %s\n", argv[2]);
+      fclose (f);
+      return (FALSE);
+    }
     xmin = MAX (0, MIN (xmin, x[i] - 1));
     ymin = MAX (0, MIN (ymin, y[i] - 1));

trunk/Ohana/src/opihi/cmd.basic/help.c

@@ -15 +15 @@
   if (argc == 1) {
     sprintf (buff, "ls %s", helpdir);
-    system (buff);
+    if (system (buff) == -1) {
+      fprintf (stderr, "help directory unavailable\n");
+      return (FALSE);
+    }
     return (TRUE);
   }

trunk/Ohana/src/opihi/cmd.basic/list_help.c

@@ -18 +18 @@
     fclose (f);
     sprintf (line, "more %s", filename);
-    system (line);
+    if (system (line) == -1) {
+      fprintf (stderr, "help list unavailable\n");
+    }
   }
   unlink (filename);

trunk/Ohana/src/opihi/cmd.data/queuedrop.c

@@ -4 +4 @@
   
   int N;
-  char *Key;
-  char *line;
-  char *Value;
-  Queue *queue;
+  char *Key = NULL;
+  char *line = NULL;
+  Queue *queue = NULL;
+  char *Value = NULL;
 
   Key = NULL;

trunk/Ohana/src/opihi/dvo/elixir.c

@@ -46 +46 @@
 
   sprintf (msgfile, "%s/EMsg.XXXXXX", fifodir);
-  mkstemp (msgfile);
+  if (mkstemp (msgfile) == -1) {
+    gprint (GP_ERR, "can't create fifo\n");
+    return (FALSE);
+  }
   sprintf (message, "%s %s", cmd, msgfile);
   unlink (msgfile);

trunk/Ohana/src/opihi/lib.shell/interrupt.c

@@ -27 +27 @@
   while (1) {
     gprint (GP_ERR, "operation halted, continue? (y/n) ");
-    fscanf (stdin, "%s", string);
+    if (fscanf (stdin, "%s", string) != 1) fprintf (stderr, "what?\n");
     
     if ((string[0] == 'y') || (string[0] == 'Y')) {