Don't hardcode values

diff --git a/append.c b/append.c
index bab69e99b38ef2e5ab6e6d0e38428ad651efc3be..96c625bd27eaeb7ac029259f21f27a01d11048a2 100644 (file)
--- a/append.c
+++ b/append.c
@@ -50,7 +50,7 @@ void append (FILE *ofp, char *fname) {
     
     }
     
-    memset (temp, 0x20, 16);
+    memset (temp, ' ', 16);
     temp[0] = '0';
     
     if ((p = strrchr (fname, '/'))) {
@@ -66,7 +66,7 @@ void append (FILE *ofp, char *fname) {
     memcpy (header.name, name, len);
     
     while (len < 16) {
-        header.name[len++] = 0x20;
+        header.name[len++] = ' ';
     }
     
     memcpy (header.mtime, temp, 12);
@@ -78,12 +78,12 @@ void append (FILE *ofp, char *fname) {
     bytes = ftell (tfp);
     
     len = sprintf (temp, "%ld", bytes);
-    temp[len] = 0x20;
+    temp[len] = ' ';
     
     memcpy (header.size, temp, 10);
     
-    header.endsig[0] = 0x60;
-    header.endsig[1] = 0x0A;
+    header.endsig[0] = '`';
+    header.endsig[1] = '\n';
     
     need_newline = (bytes % 2);
     
@@ -137,7 +137,7 @@ void append (FILE *ofp, char *fname) {
     
     if (need_newline) {
     
-        temp[0] = 0x0A;
+        temp[0] = '\n';
         
         if (fwrite (temp, 1, 1, ofp) != 1) {
         

diff --git a/conv.c b/conv.c
index f8267ab53b508fd4580f2de1126718ee42402454..991968ad43f1d2791b253a422ebd252e184d0dc6 100644 (file)
--- a/conv.c
+++ b/conv.c
@@ -5,12 +5,19 @@
 
 uint32_t conv_dec (char *str, int32_t max) {
 
+    char ch;
     uint32_t value = 0;
     
-    while (*str != ' ' && max-- > 0) {
+    while ((ch = *str)) {
     
+        if (ch == ' ' || max == 0) {
+            break;
+        }
+        
         value *= 10;
-        value += *str++ - '0';
+        
+        value += (ch - '0');
+        str++;
     
     }
     

diff --git a/delete.c b/delete.c
index e190ce01a81b2dfd22592d7f8832bc827161bed5..40038c523f788e8ef6c588a8dc3da8e3e435abed 100644 (file)
--- a/delete.c
+++ b/delete.c
@@ -16,7 +16,7 @@ void delete (char *fname) {
     char temp[17], *name, *p, *contents;
     long bytes, len, read;
     
-    if (fwrite ("!<arch>\x0A", 8, 1, tfp) != 1) {
+    if (fwrite ("!<arch>\n", 8, 1, tfp) != 1) {
     
         fclose (tfp);
         

diff --git a/ranlib.c b/ranlib.c
index 3a8881769b26766b73022b2e426d7695955dccc5..76370ecc21d701991a1ec0a44d4b093d5ba29eda 100644 (file)
--- a/ranlib.c
+++ b/ranlib.c
@@ -314,7 +314,7 @@ void ranlib (void) {
     
     }
     
-    if (fwrite ("!<arch>\x0A", 8, 1, tfp) != 1) {
+    if (fwrite ("!<arch>\n", 8, 1, tfp) != 1) {
     
         fclose (tfp);
         
@@ -323,14 +323,14 @@ void ranlib (void) {
     
     }
     
-    memset (temp, 0x20, 16);
+    memset (temp, ' ', 16);
     temp[0] = '0';
     
     len = 1;
     memcpy (header.name, "/", len);
     
     while (len < 16) {
-        header.name[len++] = 0x20;
+        header.name[len++] = ' ';
     }
     
     memcpy (header.mtime, temp, 12);
@@ -339,12 +339,12 @@ void ranlib (void) {
     memcpy (header.mode, temp, 8);
     
     len = sprintf (temp, "%ld", bytes + 4);
-    temp[len] = 0x20;
+    temp[len] = ' ';
     
     memcpy (header.size, temp, 10);
     
-    header.endsig[0] = 0x60;
-    header.endsig[1] = 0x0A;
+    header.endsig[0] = '`';
+    header.endsig[1] = '\n';
     
     if (fwrite (&header, sizeof (header), 1, tfp) != 1) {
     

diff --git a/replace.c b/replace.c
index 3df068c7603dc603fb4524e0f875c227528130e8..fba834d336511ce8955fa8a040a886830f506b64 100644 (file)
--- a/replace.c
+++ b/replace.c
@@ -16,7 +16,7 @@ void replace (char *fname) {
     char temp[17], *name, *p, *contents;
     long bytes, len, read;
     
-    if (fwrite ("!<arch>\x0A", 8, 1, tfp) != 1) {
+    if (fwrite ("!<arch>\n", 8, 1, tfp) != 1) {
     
         fclose (tfp);