using [xa]sprintf for string concatenation is neat and saves

~100 bytes according to bloatcheck. Also this fixes bug in rpm



git-svn-id: svn://busybox.net/trunk/busybox@16081 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 3 insertions, 4 deletions

diff --git a/procps/sysctl.c b/procps/sysctl.c
index 03a03889e..297a12a85 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -129,7 +129,7 @@ int sysctl_preload_file(const char *filename, int output)
         }
 
         while (fgets(oneline, sizeof(oneline) - 1, fp)) {
-                oneline[sizeof(oneline) - 1] = 0;
+                oneline[sizeof(oneline) - 1] = '\0';
                 lineno++;
                 trim(oneline);
                 ptr = (char *) oneline;
@@ -156,9 +156,8 @@ int sysctl_preload_file(const char *filename, int output)
 
                 while ((*value == ' ' || *value == '\t') && *value != 0)
                         value++;
-                strcpy(buffer, name);
-                strcat(buffer, "=");
-                strcat(buffer, value);
+                /* safe because sizeof(oneline) == sizeof(buffer) */
+                sprintf(buffer, "%s=%s", name, value);
                 sysctl_write_setting(buffer, output);
         }
         fclose(fp);