Ticket #886: tt_886.patch

config/gen/platform/generic/exec.c

@@ -54 +54 @@
     }
     else {
         /* child */
-        char *cmd    = Parrot_str_to_cstring(interp, command);
-        int   status = execlp("sh", "sh", "-c", cmd, (void *)NULL);
+        char * const cmd    = Parrot_str_to_cstring(interp, command);
+        int          status = execlp("sh", "sh", "-c", cmd, (void *)NULL);
 
         /* if we get here, something's horribly wrong, but free anyway... */
-        mem_sys_free(cmd);
+        Parrot_str_free_cstring(cmd);
 
         if (status)
             exit(status);
@@ -96 +96 @@
     if (child) {
         /* parent */
         int status;
-        pid_t returnstat;
-        returnstat = waitpid(child, &status, 0);
+        pid_t returnstat = waitpid(child, &status, 0);
         UNUSED(returnstat);
         return status;
     }
@@ -105 +104 @@
         /* child. Be horribly profligate with memory, since we're
            about to be something else */
         int status, i;
-        char **argv;
         STRING *s;
-        char *cmd;
+        char   *cmd;
+        char  **argv = (char **)mem_sys_allocate((len+1)*sizeof (char *));
 
-        argv = (char **)mem_sys_allocate((len+1)*sizeof (char *));
         for (i = 0; i < len; ++i) {
             s = VTABLE_get_string_keyed_int(interp, cmdargs, i);
             argv[i] = Parrot_str_to_cstring(interp, s);
         }
-        cmd = argv[0];
-        argv[i] = NULL;
 
-        status = execvp(cmd, argv);
+        cmd     = argv[0];
+        argv[i] = NULL;
+        status  = execvp(cmd, argv);
         /* if we get here, something's horribly wrong... */
         if (status) {
             exit(status);

src/debug.c

@@ -1274 +1274 @@
             tmp_stdin, readline,
             "S->S", prompt, & s);
         {
-        char * aux = Parrot_str_to_cstring(interpdeb, s);
+        char * const aux = Parrot_str_to_cstring(interpdeb, s);
         strcpy(c, aux);
         Parrot_str_free_cstring(aux);
         }

src/dynext.c

@@ -233 +233 @@
 {
     ASSERT_ARGS(dlopen_string)
 
-    char *pathstr = Parrot_str_to_cstring(interp, path);
-    void *handle = Parrot_dlopen(pathstr);
+    char * const pathstr = Parrot_str_to_cstring(interp, path);
+    void *       handle  = Parrot_dlopen(pathstr);
     Parrot_str_free_cstring(pathstr);
     return handle;
 }

src/interp/inter_misc.c

@@ -341 +341 @@
 
             else {
                 /* Need to strip back to what follows the final / or \. */
-                STRING *fullname   = VTABLE_get_string(interp, exe_name);
-                char   *fullname_c = Parrot_str_to_cstring(interp, fullname);
-                int     pos        = strlen(fullname_c) - 1;
+                STRING *       fullname   = VTABLE_get_string(interp, exe_name);
+                char   * const fullname_c = Parrot_str_to_cstring(interp, fullname);
+                int            pos        = strlen(fullname_c) - 1;
 
                 while (pos              >  0
                 &&     fullname_c[pos] != '/'
@@ -354 +354 @@
                     pos++;
 
                 basename = Parrot_str_new(interp, fullname_c + pos, 0);
-                mem_sys_free(fullname_c);
+                Parrot_str_free_cstring(fullname_c);
 
                 return basename;
             }

src/io/unix.c

@@ -764 +764 @@
     }
 
 #  else
-    UNUSED(l);
+    UNUSED(filehandle);
     UNUSED(command);
     UNUSED(flags);
     Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,

src/pmc/os.pmc

@@ -476 +476 @@
 */
     METHOD readdir(STRING *path) {
 #ifndef _MSC_VER
+        char  * const cpath = Parrot_str_to_cstring(interp, path);
+        DIR           *dir  = opendir(cpath);
         struct dirent *dirent;
         PMC           *array;
-        char          *cpath = Parrot_str_to_cstring(interp, path);
         STRING        *retval;
-        DIR           *dir   = opendir(cpath);
 
         Parrot_str_free_cstring(cpath);
 

src/pmc/string.pmc

@@ -52 +52 @@
 
     VTABLE void mark() {
         STRING *str_val;
+
+        if (!PMC_data(SELF))
+            return;
+
         GET_ATTR_str_val(INTERP, SELF, str_val);
         Parrot_gc_mark_STRING_alive(INTERP, str_val);
     }
@@ -202 +206 @@
 
         /* Only allow constant PMCs to embed constant strings */
         if (PObj_constant_TEST(SELF) && !PObj_constant_TEST(value)) {
-            char *copy = Parrot_str_to_cstring(INTERP, value);
-            value      = Parrot_str_new_init(INTERP, copy, strlen(copy),
+            char * const copy = Parrot_str_to_cstring(INTERP, value);
+            value             = Parrot_str_new_init(INTERP, copy, strlen(copy),
                 PARROT_DEFAULT_ENCODING, PARROT_DEFAULT_CHARSET,
                 PObj_constant_FLAG);
             Parrot_str_free_cstring(copy);