Changeset 1b9d3cc for util.c

Timestamp:

Oct 26, 2009, 12:23:01 AM (15 years ago)

Author:

Geoffrey Thomas <geofft@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

1ee5c79

Parents:

a3e61a2

git-author:

Karl Ramm <kcr@1ts.org> (10/25/09 23:35:27)

git-committer:

Geoffrey Thomas <geofft@mit.edu> (10/26/09 00:23:01)

Message:

atoi("puce") == 0

Signed-off-by: Geoffrey Thomas <geofft@mit.edu>

File:

• util.c (modified) (2 diffs)

util.c

@@ -430 +430 @@
 {
   int c, i;
+  char *p;
 
   for (i = 0; i < (sizeof(color_map)/sizeof(color_map[0])); i++)
@@ -435 +436 @@
       return color_map[i].number;
 
-  c = atoi(color);
-  if (c >= -1 && c < COLORS) {
+  c = strtol(color, &p, 10);
+  if (p != color && c >= -1 && c < COLORS) {
     return(c);
   }