Browse Source

toolchain/toolchain-wrapper.c: slightly simplify cmdline copying

C99 section 5.1.2.2.1p2 mandates that:

- argv[argc] shall be a null pointer.

https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf

So we might as well copy the null pointer along in the memcpy() rather than
copy everything up to the null pointer and then add one afterwards for
simplicity.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
Peter Korsgaard 2 months ago
parent
commit
6b8ffbf97b
1 changed files with 2 additions and 6 deletions
  1. 2 6
      toolchain/toolchain-wrapper.c

+ 2 - 6
toolchain/toolchain-wrapper.c

@@ -503,12 +503,8 @@ int main(int argc, char **argv)
 #endif
 #endif
 	}
 	}
 
 
-	/* append forward args */
-	memcpy(cur, &argv[1], sizeof(char *) * (argc - 1));
-	cur += argc - 1;
-
-	/* finish with NULL termination */
-	*cur = NULL;
+	/* append forward args and terminating NULL */
+	memcpy(cur, &argv[1], sizeof(char *) * argc);
 
 
 	exec_args = args;
 	exec_args = args;
 #ifdef BR_CCACHE
 #ifdef BR_CCACHE