Changeset 35698

Timestamp:

Jun 21, 2013, 3:20:32 PM (13 years ago)

Author:

eugene

Message:

add check option to glockfile; check for non-ascii chars in ra/dec values

Location:

branches/eam_branches/ipp-20130509/Ohana/src/tools/src

Files:

• glockfile.c (modified) (1 diff)
• radec.c (modified) (1 diff)

branches/eam_branches/ipp-20130509/Ohana/src/tools/src/glockfile.c

@@ -33 +33 @@
     type = LCK_XCLD;
   }
+  if (!strcasecmp (argv[2], "check")) {
+    fchecklockfile (filename, LCK_HARD, &state);
+    exit (0);
+  }
 
   f = fsetlockfile (filename, timeout, type, &state);

branches/eam_branches/ipp-20130509/Ohana/src/tools/src/radec.c

@@ -84 +84 @@
 
   flag_h = dparse (h, 1, string);
+  if (!flag_h) {
+    fprintf (stderr, "warning -- invalid number / non-ascii characters in string : %s\n", string);
+    return FALSE;
+  }
   flag_d = dparse (d, Nfields + 1, string);
+  if (!flag_d) {
+    fprintf (stderr, "warning -- invalid number / non-ascii characters in string : %s\n", string);
+    return FALSE;
+  }
   *h *= flag_h;
   *d *= flag_d;
 
   if (Nfields > 1) {
-    dparse (&tmp, 2, string);
+    if (!dparse (&tmp, 2, string)) {
+      fprintf (stderr, "warning -- invalid number / non-ascii characters in string : %s\n", string);
+      return FALSE;
+    }
+
     *h += tmp/60.0;
-    dparse (&tmp, Nfields + 2, string);
+    if (!dparse (&tmp, Nfields + 2, string)) {
+      fprintf (stderr, "warning -- invalid number / non-ascii characters in string : %s\n", string);
+      return FALSE;
+    }
+
     *d += tmp/60.0;
   }
 
   if (Nfields > 2) {
-    dparse (&tmp, 3, string);
+    if (!dparse (&tmp, 3, string)) {
+      fprintf (stderr, "warning -- invalid number / non-ascii characters in string : %s\n", string);
+      return FALSE;
+    }
+
     *h += tmp/3600.0;
-    dparse (&tmp, Nfields + 3, string);
+    if (!dparse (&tmp, Nfields + 3, string)) {
+      fprintf (stderr, "warning -- invalid number / non-ascii characters in string : %s\n", string);
+      return FALSE;
+    }
+
     *d += tmp/3600.0;
   }