summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorforsyth <forsyth@vitanuova.com>2011-03-30 09:26:38 +0100
committerforsyth <forsyth@vitanuova.com>2011-03-30 09:26:38 +0100
commit48c2bcd8842a77d6fca4a18505e622e9a9d3d38b (patch)
treed5df8515ef73a5f8c0733982de96307760640b4c
parentd850935a944d6b7390dc1e3350c70dd438f6777a (diff)
20110330-0926
-rw-r--r--CHANGES2
-rw-r--r--include/version.h2
-rw-r--r--libtk/buton.c2
-rw-r--r--libtk/listb.c2
-rw-r--r--libtk/menus.c2
-rw-r--r--libtk/scale.c2
6 files changed, 7 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index ea5d627e..b8698b74 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20110330
+ call strtol not atoi for hex numbers [issue 255, mechiel]
20110329
utils/mkdir/mkdir.c - add -p option [mechiel, issue 250]
emu/Linux/mkfile - try searching -lpthread after -lrt for sem_* [issue 247]
diff --git a/include/version.h b/include/version.h
index 607f926b..2a0fb5e3 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20110329)"
+#define VERSION "Fourth Edition (20110330)"
diff --git a/libtk/buton.c b/libtk/buton.c
index 325422b9..ba393ea0 100644
--- a/libtk/buton.c
+++ b/libtk/buton.c
@@ -584,7 +584,7 @@ tkbuttonkey(Tk *tk, char *arg, char **val)
if(tk->flag & Tkdisabled)
return nil;
- key = atoi(arg);
+ key = strtol(arg, nil, 0);
if (key == '\n' || key ==' ')
return tkbuttoninvoke(tk, nil, val);
return nil;
diff --git a/libtk/listb.c b/libtk/listb.c
index df5eea0b..630e6a06 100644
--- a/libtk/listb.c
+++ b/libtk/listb.c
@@ -999,7 +999,7 @@ tklistbkey(Tk *tk, char *arg, char **val)
if(tk->flag & Tkdisabled)
return nil;
- key = atoi(arg);
+ key = strtol(arg, nil, 0);
active = 0;
for (e = l->head; e != nil; e = e->link) {
if (e->flag & Tkactive)
diff --git a/libtk/menus.c b/libtk/menus.c
index ac1d0e42..b8310aba 100644
--- a/libtk/menus.c
+++ b/libtk/menus.c
@@ -449,7 +449,7 @@ tkMBkey(Tk *tk, char *arg, char **val)
if(tk->flag & Tkdisabled)
return nil;
- key = atoi(arg);
+ key = strtol(arg, nil, 0);
if (key == '\n' || key == ' ')
return tkMBpress(tk, "1", nil);
return nil;
diff --git a/libtk/scale.c b/libtk/scale.c
index ca42a106..d2ce8a33 100644
--- a/libtk/scale.c
+++ b/libtk/scale.c
@@ -926,7 +926,7 @@ tkscalekey(Tk *tk, char *arg, char **val)
if(tk->flag & Tkdisabled)
return nil;
- key = atoi(arg);
+ key = strtol(arg, nil, 0);
if (key == Up || key == Left)
pos = trough1;
else if (key == Down || key == Right)