Changeset 10073

Timestamp:

Nov 17, 2006, 5:04:25 PM (19 years ago)

Author:

eugene

Message:

added additional chars to whitespace checks

Location:

trunk/Ohana/src

Files:

• imregister/base/ConfigFilter.c (modified) (1 diff)
• imregister/base/misc.c (modified) (2 diffs)
• libfits/header/F_modify.c (modified) (2 diffs)
• libfits/header/F_scan.c (modified) (3 diffs)
• libkapa/src/DrawRotString.c (modified) (4 diffs)
• libkapa/src/PSRotFont.c (modified) (6 diffs)
• libkapa/src/bDrawRotFont.c (modified) (3 diffs)
• libohana/include/ohana.h (modified) (1 diff)
• libohana/src/config.c (modified) (2 diffs)
• libohana/src/string.c (modified) (2 diffs)
• misc/src/string.c (modified) (2 diffs)
• misc/src/test.c (modified) (3 diffs)
• opihi/cmd.data/init.c (modified) (2 diffs)
• opihi/lib.shell/expand_vars.c (modified) (1 diff)
• opihi/lib.shell/expand_vectors.c (modified) (1 diff)
• opihi/lib.shell/isolate_elements.c (modified) (1 diff)
• opihi/lib.shell/opihi.c (modified) (1 diff)
• opihi/lib.shell/parse.c (modified) (2 diffs)
• opihi/lib.shell/string.c (modified) (15 diffs)

trunk/Ohana/src/imregister/base/ConfigFilter.c

@@ -72 +72 @@
   for (i = 0; i < strlen (line); i++, p++) {
     *p = line[i];
-    if (whitespace(line[i])) { 
+    if (OHANA_WHITESPACE(line[i])) { 
       *p = '.';
       if (blank) p--;

trunk/Ohana/src/imregister/base/misc.c

@@ -109 +109 @@
   
    
-/* replaces whitespace blocks with single . */
+/* replaces WHITESPACE blocks with single . */
 void clean_spaces (char *line) {
 
@@ -118 +118 @@
   out = in = line;
   while (*in) {
-    if (whitespace(*in)) { 
+    if (OHANA_WHITESPACE(*in)) { 
       *out = '.';
       out ++;
       in ++;
-      while (*in && whitespace(*in)) in++;
+      while (*in && OHANA_WHITESPACE(*in)) in++;
     } else {
       *out = *in;

trunk/Ohana/src/libfits/header/F_modify.c

@@ -117 +117 @@
   
   c += 2;
-  /* advance pointer over whitespace */
+  /* advance pointer over WHITESPACE */
   while ((*c == ' ') && (c < line + 80)) { c++; }
   
@@ -137 +137 @@
   c1 += 2;
 
-  /* advance pointer over whitespace */
+  /* advance pointer over WHITESPACE */
   while ((*c1 == ' ') && (c1 < line + 80)) { c1++; }
   

trunk/Ohana/src/libfits/header/F_scan.c

@@ -42 +42 @@
     Nchar = MIN (80, p + 80 - q);
     memcpy (tmp, q, Nchar);
-    gfits_stripwhite (tmp);
+    stripwhite (tmp);
     strcpy (va_arg (argp, char *), tmp);
     return (TRUE);
@@ -55 +55 @@
     bzero (tmp, 81);
     memcpy (tmp, s, Nchar);
-    gfits_stripwhite (tmp);
+    stripwhite (tmp);
     strcpy (va_arg (argp, char *), tmp);
     return (TRUE);
@@ -94 +94 @@
 /* if the variable argument stuff breaks on another system, look 
 at F_modify.c as it has the old code */
-
-#ifndef whitespace
-#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
-#endif
-
-/* Strip whitespace from the start and end of STRING. */
-int gfits_stripwhite (char *string) {
-
-  int i;
-
-  if (string == (char *) NULL)
-    return (FALSE);
-
-  for (i = 0; whitespace (string[i]); i++);
-  if (i) memmove (string, string + i, strlen(string+i)+1);
-  for (i = strlen (string) - 1; (i > 0) && whitespace (string[i]); i--);
-  string[++i] = 0;
-
-  return (i);
-
-}
-
-# if (0)
-    one_quote = FALSE;
-    tmp[0] = *(p + 10);
-    if (tmp[0] == 0x27)
-      one_quote = TRUE;
-    /* end the string if we hit: a -- end of line (80 chars) b -- NEWLINE c -- '(0x27: single quote) (end of string) */
-    for (i = 1; (i < 70) && (p[i + 10] != NEWLINE) && ((p[i + 10] != 0x27) || !one_quote); i++) {
-      tmp[i] = *(p + 10 + i);
-      if ((tmp[i] == 0x27) && !one_quote)
-        one_quote = TRUE;
-      if ((tmp[i] == 0x2f) && !one_quote)
-        break;
-    }
-    tmp[i] = 0;
-    if ((c = strchr (tmp, 0x27)) != NULL)
-      *c = ' ';
-# endif

trunk/Ohana/src/libkapa/src/DrawRotString.c

@@ -26 +26 @@
 
   unsigned char *bitmap;
-  char *currentname, basename[64], *c; 
+  char *currentname, basename[64]; 
   int i, dy, dx, N, X, Y, code;
   int dX, Xoff, dY, Yoff, YoffBase;
@@ -38 +38 @@
   basesize = currentsize;
 
-  /* strip leading whitespace */
-  for (c = string; (*c == ' ') || (*c == '\t'); c++);
-  if (*c == 0) return (FALSE);
+  /* strip leading WHITESPACE */
+  stripwhite (string);
+  if (*string == 0) return (FALSE);
   
   /* compute string length */
   cs = cos(angle*RAD_DEG);
   sn = sin(angle*RAD_DEG);
-  dX = RotStrlen (c);
+  dX = RotStrlen (string);
   dY = currentfont[65].ascent;
 
@@ -66 +66 @@
   YoffBase = Yoff;
   /* draw characters one-by-one */
-  for (i = 0; i < strlen(c); i++) {
-    N = (int)(c[i]);
+  for (i = 0; i < strlen(string); i++) {
+    N = (int)(string[i]);
     if ((N < 0) || (N >= NROTCHARS)) continue;
 
@@ -95 +95 @@
       } 
       if (N == 38) {
-        if (c[i+1] == 'h') {
+        if (string[i+1] == 'h') {
           SetRotFont ("helvetica", currentsize);
           currentfont = GetRotFontData (&currentscale);
         }
-        if (c[i+1] == 't') {
+        if (string[i+1] == 't') {
           SetRotFont ("times", currentsize);
           currentfont = GetRotFontData (&currentscale);
         }
-        if (c[i+1] == 'c') {
+        if (string[i+1] == 'c') {
           SetRotFont ("courier", currentsize);
           currentfont = GetRotFontData (&currentscale);
         }
-        if (c[i+1] == 's') {
+        if (string[i+1] == 's') {
           SetRotFont ("symbol", currentsize);
           currentfont = GetRotFontData (&currentscale);

trunk/Ohana/src/libkapa/src/PSRotFont.c

@@ -6 +6 @@
 void PSRotText (FILE *f, int x, int y, char *string, int pos, double angle) {
 
-  char *c, *segment, basename[64], *currentname;
+  char *segment, basename[64], *currentname;
   int i, N, code;
   int dX, dY, Xoff, Yoff, X, Y, Nseg, NSEG, YoffBase;
@@ -18 +18 @@
   basesize = currentsize;
 
-  /* strip off leading whitespace */
-  for (c = string; (*c == ' ') || (*c == '\t'); c++);
-  if (*c == 0) return;
+  /* strip off leading WHITESPACE */
+  stripwhite (string);
+  if (*string == 0) return;
   
   /* compute string length */
@@ -29 +29 @@
   if (!strcmp (currentname, "helvetica")) fscale = 0.9;
   if (!strcmp (currentname, "symbol")) fscale = 1.2;
-  dX = fscale*RotStrlen (c);
+  dX = fscale*RotStrlen (string);
   dY = currentfont[65].ascent;
   
@@ -55 +55 @@
 
   Nseg = 0;
-  NSEG = strlen(c) + 2;
+  NSEG = strlen(string) + 2;
   ALLOCATE (segment, char, NSEG);
   bzero (segment, NSEG);
@@ -62 +62 @@
   YoffBase = 0;
   /* accumulate string segments with common state */
-  for (i = 0; i < strlen (c); i++) {
-    N = (int)(c[i]);
+  for (i = 0; i < strlen (string); i++) {
+    N = (int)(string[i]);
     if ((N < 0) || (N >= NROTCHARS)) continue;
 
@@ -122 +122 @@
       if (N == 38) {
         PSDumpRotSegment (f, segment, &Nseg);
-        if (c[i+1] == 'h') {
+        if (string[i+1] == 'h') {
           SetRotFont ("helvetica", currentsize);
           currentfont = GetRotFontData (&currentscale);
           PSSetFont (f, currentname, currentsize);
         }
-        if (c[i+1] == 't') {
+        if (string[i+1] == 't') {
           SetRotFont ("times", currentsize);
           currentfont = GetRotFontData (&currentscale);
           PSSetFont (f, currentname, currentsize);
         }
-        if (c[i+1] == 'c') {
+        if (string[i+1] == 'c') {
           SetRotFont ("courier", currentsize);
           currentfont = GetRotFontData (&currentscale);
           PSSetFont (f, currentname, currentsize);
         }
-        if (c[i+1] == 's') {
+        if (string[i+1] == 's') {
           SetRotFont ("symbol", currentsize);
           currentfont = GetRotFontData (&currentscale);

trunk/Ohana/src/libkapa/src/bDrawRotFont.c

@@ -27 +27 @@
   basesize = currentsize;
 
-  /* strip leading whitespace */
-  for (c = string; (*c == ' ') || (*c == '\t'); c++);
-  if (*c == 0) return (FALSE);
+  /* strip leading WHITESPACE */
+  stripwhite (string);
+  if (*string == 0) return (FALSE);
   
   /* compute string length */
   cs = cos(angle*RAD_DEG);
   sn = sin(angle*RAD_DEG);
-  dX = RotStrlen (c);
+  dX = RotStrlen (string);
   dY = currentfont[65].ascent;
 
@@ -55 +55 @@
   YoffBase = Yoff;
   /* draw characters one-by-one */
-  for (i = 0; i < strlen(c); i++) {
-    N = (int)(c[i]);
+  for (i = 0; i < strlen(string); i++) {
+    N = (int)(string[i]);
     if ((N < 0) || (N >= NROTCHARS)) continue;
 
@@ -84 +84 @@
       } 
       if (N == 38) {
-        if (c[i+1] == 'h') {
+        if (string[i+1] == 'h') {
           SetRotFont ("helvetica", currentsize);
           currentfont = GetRotFontData (&currentscale);
         }
-        if (c[i+1] == 't') {
+        if (string[i+1] == 't') {
           SetRotFont ("times", currentsize);
           currentfont = GetRotFontData (&currentscale);
         }
-        if (c[i+1] == 'c') {
+        if (string[i+1] == 'c') {
           SetRotFont ("courier", currentsize);
           currentfont = GetRotFontData (&currentscale);
         }
-        if (c[i+1] == 's') {
+        if (string[i+1] == 's') {
           SetRotFont ("symbol", currentsize);
           currentfont = GetRotFontData (&currentscale);

trunk/Ohana/src/libohana/include/ohana.h

@@ -93 +93 @@
 # endif /* FOPEN */
 
+/*
+  isspace is c99 : do we require c99 now? 
+  isspace()
+   checks  for white-space characters.  In the "C" and "POSIX" locales, these are: space, form-feed ('\f'), newline ('\n'),
+   carriage return ('\r'), horizontal tab ('\t'), and vertical tab ('\v').
+   horiz. tab: 0x09, vert. tab: 0x0b, newline: 0x0a, form-feed: 0x0c, return: 0x0d, space: 0x20, 
+*/
+# define OHANA_WHITESPACE(c)(((c) == 0x09) || ((c) == 0x0a) || ((c) == 0x0b) || ((c) == 0x0b) || ((c) == 0x0c) || ((c) == 0x0d) || ((c) == 0x20))
+
 /* socket / pipe communication buffer */
 typedef struct {

trunk/Ohana/src/libohana/src/config.c

@@ -1 +1 @@
 # include <ohana.h>
-# ifndef whitespace
-# define whitespace(c) (((c) == ' ') || ((c) == '\t'))
-# endif
 
 # define D_NBYTES 4096
@@ -278 +275 @@
     }
     p2 = tmp + strlen (tfield);
-    if (whitespace (*p2)) {
+    if (OHANA_WHITESPACE (*p2)) {
       p = p2;
       i++;

trunk/Ohana/src/libohana/src/string.c

@@ -1 +1 @@
 # include <ohana.h>
 
-#ifndef whitespace
-#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
-#endif
-
-/* Strip whitespace from the start and end of STRING. */
+/* Strip WHITESPACE from the start and end of STRING. */
 int stripwhite (char *string) {
 
@@ -12 +8 @@
   if (string == (char *) NULL) return (FALSE);
 
-  for (i = 0; whitespace (string[i]); i++);
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
   if (i) memmove (string, string + i, strlen(string+i)+1);
-  for (i = strlen (string) - 1; (i > 0) && whitespace (string[i]); i--);
+  for (i = strlen (string) - 1; (i > 0) && OHANA_WHITESPACE (string[i]); i--);
   string[++i] = 0;
   return (i);

trunk/Ohana/src/misc/src/string.c

@@ -1 +1 @@
 # include <ohana.h>
 
-/* Strip whitespace from the start and end of STRING. */
+/* Strip WHITESPACE from the start and end of STRING. */
 int stripwhite (string)
 char *string;
@@ -10 +10 @@
     return (FALSE);
 
-  for (i = 0; whitespace (string[i]); i++);
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
   if (i) memmove (string, string + i, strlen(string+i)+1);
-  for (i = strlen (string) - 1; (i > 0) && whitespace (string[i]); i--);
+  for (i = strlen (string) - 1; (i > 0) && OHANA_WHITESPACE (string[i]); i--);
   string[++i] = 0;
   return (i);

trunk/Ohana/src/misc/src/test.c

@@ -23 +23 @@
 # define ISNUM(c) (isdigit(c) || (c == '-') || (c == '.'))
 
-/* Strip whitespace from the start and end of STRING. */
+/* Strip WHITESPACE from the start and end of STRING. */
 int stripwhite (string)
 char *string;
@@ -32 +32 @@
     return (0);
 
-  for (i = 0; whitespace (string[i]); i++);
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
 
   if (i)
@@ -39 +39 @@
   i = strlen (string) - 1;
 
-  for (; (i > 0) && whitespace (string[i]); i--);
+  for (; (i > 0) && OHANA_WHITESPACE (string[i]); i--);
 
   string[++i] = 0;

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

@@ -100 +100 @@
 int vgrid            PROTO((int, char **));
 int vgauss           PROTO((int, char **));
+int vmaxwell         PROTO((int, char **));
 int vload            PROTO((int, char **));
 int vstat            PROTO((int, char **));
@@ -211 +212 @@
   {"select",       vect_select,      "selective vector assignment"},
   {"vgauss",       vgauss,           ""},
+  {"vmaxwell",     vmaxwell,         ""},
   {"vgrid",        vgrid,            ""},
   {"vload",        vload,            "load vectors on Kii"},

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

@@ -38 +38 @@
     if (*L == 0) break;
 
-    V1 = aftervar (L);           /* V1 points to the first non-whitespace after the variable */
+    V1 = aftervar (L);           /* V1 points to the first non-WHITESPACE after the variable */
     V0 = thisvar (L);            /* V0 points to the name of the var */
     /* note: V1 points to a fraction of L, it does not need to be freed */

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

@@ -50 +50 @@
 
     /* find vector name */
-    for (w = p - 1; (w >= line) && !whitespace(*w) && (isalnum(*w) || (*w == ':') || (*w == '_')); w--);
+    for (w = p - 1; (w >= line) && !OHANA_WHITESPACE(*w) && (isalnum(*w) || (*w == ':') || (*w == '_')); w--);
     w ++;
     n = (int)(p - w);

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

@@ -121 +121 @@
       }
       /* not an operator, not a quoted string */
-      if (!whitespace (in[i][j])) {
+      if (!OHANA_WHITESPACE (in[i][j])) {
         InsertValue (in[i][j]);
       } else {

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

@@ -33 +33 @@
       continue;
     }
+
     Nbad = 0;
     ohana_memregister (line);

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

@@ -51 +51 @@
     if (*V1 != '=') goto error;
 
-    /* find first non-whitespace character after = */
+    /* find first non-WHITESPACE character after = */
     V1 ++;
     while (isspace (*V1)) V1++;
@@ -93 +93 @@
       val = dvomath (1, &V1, &size, 0);
       if (val == NULL) { 
-        while (whitespace (*V1)) V1++;
+        while (OHANA_WHITESPACE (*V1)) V1++;
         val = strcreate (V1);
       } 

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

@@ -3 +3 @@
 /**********************************************************************/
 /* returns a pointer to an isolated string containing the first word,
-   removing leading whitespace.  A "word" is a contiguous set of 
+   removing leading WHITESPACE.  A "word" is a contiguous set of 
    characters from the set: alphanumerics, and any of: / . _ -
-   Any other single, non-whitespace characters are considered to be 
+   Any other single, non-WHITESPACE characters are considered to be 
    complete words in themselves.  Any characters surrounded by quotes 
    make a single word 
@@ -17 +17 @@
   if (string == (char *) NULL) return ((char *) NULL);
 
-  for (i = 0; whitespace (string[i]); i++);
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *)NULL);
   if (string[i] == ';') {
@@ -63 +63 @@
 
 
-  for (j = i; (string[j] != 0) && (string[j] != ';') && !whitespace(string[j]); j++);
+  for (j = i; (string[j] != 0) && (string[j] != ';') && !OHANA_WHITESPACE(string[j]); j++);
   word = strncreate (&string[i], j - i);
   return (word);
@@ -70 +70 @@
 
 /* returns a pointer to an isolated string containing the first command,
-   removing leading whitespace.  A command ends with the first non whitespace */
+   removing leading WHITESPACE.  A command ends with the first non WHITESPACE */
 char *thiscomm (char *string) {
 
@@ -78 +78 @@
   if (string == (char *) NULL) return ((char *) NULL);
 
-  for (i = 0; whitespace (string[i]); i++);
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *)NULL);
 
-  for (j = i; ((string[j] != 0) && !whitespace (string[j])); j++);
+  for (j = i; ((string[j] != 0) && !OHANA_WHITESPACE (string[j])); j++);
   if (i == j) return ((char *) NULL);
 
@@ -122 +122 @@
   if (string == (char *) NULL) return ((char *) NULL);
 
-  for (i = 0; whitespace (string[i]); i++);
+  for (i = 0; OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *)NULL);
 
@@ -134 +134 @@
     }
     i++;
-    for (; (string[i] != 0) && whitespace (string[i]); i++);
+    for (; (string[i] != 0) && OHANA_WHITESPACE (string[i]); i++);
     if (string[i] == 0) return ((char *) NULL);
     return (&string[i]);
@@ -155 +155 @@
       return ((char *)NULL);
     }
-    for (; (string[i] != 0) && whitespace (string[i]); i++);
+    for (; (string[i] != 0) && OHANA_WHITESPACE (string[i]); i++);
     if (string[i] == 0) return ((char *) NULL);
     return (&string[i]);
@@ -161 +161 @@
 
   if (string[i] == ';') i++;
-  for (; (string[i] != 0) && (string[i] != ';') && !whitespace(string[i]); i++);
-  for (; (string[i] != 0) && whitespace (string[i]); i++);
+  for (; (string[i] != 0) && (string[i] != ';') && !OHANA_WHITESPACE(string[i]); i++);
+  for (; (string[i] != 0) && OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *) NULL);
 
@@ -169 +169 @@
 
 /* returns a pointer to the next command, or (char *) NULL 
-   if there is not a next command.  A command is bounded by whitespace */
+   if there is not a next command.  A command is bounded by WHITESPACE */
 char *nextcomm (char *string) {
 
@@ -176 +176 @@
   if (string == (char *) NULL) return ((char *) NULL);
   
-  for (i = 0; (string[i] != 0) && !whitespace (string[i]); i++);
+  for (i = 0; (string[i] != 0) && !OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *) NULL);
   
-  for (; whitespace (string[i]); i++);
+  for (; OHANA_WHITESPACE (string[i]); i++);
   if (string[i] == 0) return ((char *) NULL);
 
@@ -193 +193 @@
   if (c == (char *) NULL) return ((char *) NULL);
 
-  for (; !whitespace(*c) && (c >= string); c--);
+  for (; !OHANA_WHITESPACE(*c) && (c >= string); c--);
   if (c < string) return ((char *)NULL);
 
-  for (; whitespace(*c) && (c >= string); c--);
+  for (; OHANA_WHITESPACE(*c) && (c >= string); c--);
   if (c < string)
     return ((char *)NULL);
-  for (; !whitespace(*c) && (c >= string); c--);
+  for (; !OHANA_WHITESPACE(*c) && (c >= string); c--);
   c++;
   return (c);
@@ -207 +207 @@
 
 /* take a pointer to the beginning of a variable (ie $fred) and return
-   a pointer to the next thing (non whitespace) which is not part of the
+   a pointer to the next thing (non WHITESPACE) which is not part of the
    variable extract only the variable name */
 
@@ -224 +224 @@
   if (i == start) return ((char *) NULL);
 
-  for (j = i; whitespace (string[j]); j++);
+  for (j = i; OHANA_WHITESPACE (string[j]); j++);
   if (string[j] == 0) return ((char *)NULL);
 
@@ -240 +240 @@
   if (c == (char *) NULL) return ((char *) NULL);
 
-  for (; (c >= string) && whitespace(*c); c--);
+  for (; (c >= string) && OHANA_WHITESPACE(*c); c--);
   if (c < string) return ((char *)NULL);