From: Florian Forster <octo@verplant.org>
Date: Sat, 21 Jun 2008 15:43:07 +0000 (+0200)
Subject: src/rrdc.c: According to C99 argv is NULL terminated, so don't copy the array.
X-Git-Url: https://git.octo.it/?p=rrdd.git;a=commitdiff_plain;h=beb7e531b4a534959296d113341672b39755a867

src/rrdc.c: According to C99 argv is NULL terminated, so don't copy the array.
---

diff --git a/src/rrdc.c b/src/rrdc.c
index 65c9912..eae16a1 100644
--- a/src/rrdc.c
+++ b/src/rrdc.c
@@ -78,24 +78,13 @@ int main (int argc, char **argv)
   }
   else
   {
-    char **argv_copy;
-
     fprintf (stdout, "RRDc 1.0.0  Copyright 2008 by Florian Forster "
         "<octo at verplant.org>\n\n");
     fflush (stdout);
 
-    /* Copy argv so we can assure that it is NULL terminated. */
-    argv_copy = (char **) malloc (sizeof (char *) * (argc + 1));
-    if (argv_copy == NULL)
-    {
-      fprintf (stderr, "malloc failed.\n");
-      return (1);
-    }
-    memcpy (argv_copy, argv, sizeof (char *) * argc);
-    /* argv_copy[0] = "rrdtool"; */
-    argv_copy[argc] = NULL;
+    assert (argv[argc] == NULL);
 
-    status = execvp ("rrdtool", argv_copy);
+    status = execvp ("rrdtool", argv);
     fprintf (stderr, "execv failed with status %i.\n", status);
     return (1);
   }