Ticket #1824: arg0-fix.patch

src/system/libroot/os/image.c

@@ -33 +33 @@
 
         if (invoker[0]) {
             status = __parse_invoke_line(invoker, &newArgs,
-                (char * const **)&args, &argCount);
+                (char * const **)&args, &argCount, args[1]);
             if (status < B_OK)
                 return status;
         }
@@ -146 +146 @@
 
 status_t
 __parse_invoke_line(char *invoker, char ***_newArgs,
-    char * const **_oldArgs, int32 *_argCount)
+    char * const **_oldArgs, int32 *_argCount, const char *arg0)
 {
     int32 i, count = 0;
     char *arg = invoker;
@@ -166 +166 @@
     // copy invoker and old arguments and to newArgs
 
     for (i = 0; (arg = next_argument(&invoker, true)) != NULL; i++) {
-        newArgs[i] = arg;
+        newArgs[i] = arg;
     }
     for (i = 0; i < *_argCount; i++) {
-        newArgs[i + count] = (char *)(*_oldArgs)[i];
+        if (i == 0)
+            newArgs[i + count] = arg0;
+        else
+            newArgs[i + count] = (char *)(*_oldArgs)[i];
     }
 
     newArgs[i + count] = NULL;

src/system/libroot/posix/unistd/exec.c

@@ -72 +72 @@
 
     // test validity of executable + support for scripts
     {
-        status_t status = __test_executable(args[0], invoker);
+        status_t status = __test_executable(path, invoker);
         if (status < B_OK) {
             errno = status;
             return -1;
         }
 
         if (invoker[0]) {
-            status = __parse_invoke_line(invoker, &newArgs, &args, &argCount);
+            status = __parse_invoke_line(invoker, &newArgs, &args, &argCount, path);
             if (status < B_OK) {
                 errno = status;
                 return -1;
@@ -94 +94 @@
     // don't care and pass everything to the kernel - it will have to
     // do the right thing :)
 
-    errno = _kern_exec(path, argCount, args, envCount, environment);
+    errno = _kern_exec(path, argCount, newArgs ? newArgs : args, envCount, environment);
         // if this call returns, something definitely went wrong
 
     free(newArgs);

headers/private/libroot/libroot_private.h

@@ -22 +22 @@
 #endif
 
 status_t __parse_invoke_line(char *invoker, char ***_newArgs,
-            char * const **_oldArgs, int32 *_argCount);
+            char * const **_oldArgs, int32 *_argCount, const char *arg0);
 status_t __get_next_image_dependency(image_id id, uint32 *cookie,
             const char **_name);
 status_t __test_executable(const char *path, char *invoker);