Attachment #140044 for bug #186490

View | Details | Raw Unified | Return to bug 186490
Collapse All | Expand All

Lines 3-9 Link Here

(-)emulators/qemu-devel/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= qemu	4	PORTNAME= qemu
5	PORTVERSION= 1.7.0	5	PORTVERSION= 1.7.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= http://wiki.qemu.org/download/:release \	8	MASTER_SITES= http://wiki.qemu.org/download/:release \
9	LOCAL/nox:snapshot	9	LOCAL/nox:snapshot
Lines 67-72 PATCHFILES= \ Link Here
67	0017-bsd-user-add-support-for-miscellaneous-system-calls.patch \	67	0017-bsd-user-add-support-for-miscellaneous-system-calls.patch \
68	0018-bsd-user-add-arm-mips-and-mips64-options-to-configur.patch	68	0018-bsd-user-add-arm-mips-and-mips64-options-to-configur.patch
69	PATCH_DIST_STRIP= -p1	69	PATCH_DIST_STRIP= -p1
		70	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bsd-user-freebsd-os-proc.c
70	.endif	71	.endif
71		72
72	CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib	73	CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib




--- a/bsd-user/freebsd/os-proc.c
--- b/bsd-user/freebsd/os-proc.c
@@ -83,7 +83,7 @@ out:
 }
 
 static int
-is_target_shell_script(int fd, char *interp, size_t size)
+is_target_shell_script(int fd, char *interp, size_t size, char **interp_args)
 {
     char buf[2], *p, *b;
     ssize_t n;
@@ -120,7 +120,21 @@ is_target_shell_script(int fd, char *int
             return 0;
         }
         if ((p = memchr(b, '\n', size)) != NULL) {
+            int hasargs = 0;
             *p = 0;
+
+            *interp_args = NULL;
+            p = interp;
+            while (*p) {
+                if ((*p == ' ') || (*p == '\t')) {
+                    hasargs = 1;
+                    *p = 0;
+                } else if (hasargs) {
+                    *interp_args = p;
+                    break;
+                }
+                ++p;
+            }
             return 1;
         }
         b += n;
@@ -136,7 +150,7 @@ is_target_shell_script(int fd, char *int
 abi_long freebsd_exec_common(abi_ulong path_or_fd, abi_ulong guest_argp,
         abi_ulong guest_envp, int do_fexec)
 {
-    char **argp, **envp, **qargp, **qarg1, **qarg0;
+    char **argp, **envp, **qargp, **qarg1, **qarg0, **qargend;
     int argc, envc;
     abi_ulong gp;
     abi_ulong addr;
@@ -166,7 +180,7 @@ abi_long freebsd_exec_common(abi_ulong p
         envc++;
     }
 
-    qarg0 = argp =  alloca((argc + 4) * sizeof(void *));
+    qarg0 = argp =  alloca((argc + 5) * sizeof(void *));
     /* save the first agrument for the emulator */
     *argp++ = (char *)getprogname();
     qargp = argp;
@@ -188,7 +202,8 @@ abi_long freebsd_exec_common(abi_ulong p
         }
         total_size += strlen(*q) + 1;
     }
-    *q = NULL;
+    *q++ = NULL;
+    qargend = q;
 
     for (gp = guest_envp, q = envp; gp; gp += sizeof(abi_ulong), q++) {
         if (get_user_ual(addr, gp)) {
@@ -217,7 +232,7 @@ abi_long freebsd_exec_common(abi_ulong p
     }
 
     if (do_fexec) {
-        char execpath[PATH_MAX];
+        char execpath[PATH_MAX], *scriptargs;
 
         if (((int)path_or_fd > 0 &&
             is_target_elf_binary((int)path_or_fd)) == 1) {
@@ -238,7 +253,7 @@ abi_long freebsd_exec_common(abi_ulong p
                 goto execve_end;
             }
         } else if (is_target_shell_script((int)path_or_fd, execpath,
-                    sizeof(execpath)) != 0) {
+                    sizeof(execpath), &scriptargs) != 0) {
             char scriptpath[PATH_MAX];
 
             /* execve() as a target script using emulator. */
@@ -246,6 +261,10 @@ abi_long freebsd_exec_common(abi_ulong p
                         sizeof(scriptpath)) != NULL) {
                 *qargp = execpath;
                 *qarg1 = scriptpath;
+                if (scriptargs) {
+                    memmove(qarg1 + 1, qarg1, (qargend-qarg1) * sizeof(*qarg1));
+                    *qarg1 = scriptargs;
+                }
                 ret = get_errno(execve(qemu_proc_pathname, qarg0, envp));
             } else {
                 ret = -TARGET_EBADF;
@@ -256,7 +275,7 @@ abi_long freebsd_exec_common(abi_ulong p
         }
     } else {
         int fd;
-        char execpath[PATH_MAX];
+        char execpath[PATH_MAX], *scriptargs;
 
         p = lock_user_string(path_or_fd);
         if (p == NULL) {
@@ -275,11 +294,15 @@ abi_long freebsd_exec_common(abi_ulong p
             *qarg1 = (char *)p;
             ret = get_errno(execve(qemu_proc_pathname, qargp, envp));
         } else if (is_target_shell_script(fd, execpath,
-                    sizeof(execpath)) != 0) {
+                    sizeof(execpath), &scriptargs) != 0) {
             close(fd);
             /* execve() as a target script using emulator. */
             *qargp = execpath;
             *qarg1 = (char *)p;
+            if (scriptargs) {
+                memmove(qarg1 + 1, qarg1, (qargend-qarg1) * sizeof(*qarg1));
+                *qarg1 = scriptargs;
+            }
             ret = get_errno(execve(qemu_proc_pathname, qarg0, envp));
         } else {
             close(fd);

Return to bug 186490

Line 0 Link Here

(-)emulators/qemu-devel/files/extra-patch-bsd-user-freebsd-os-proc.c (+116 lines)
		1	--- a/bsd-user/freebsd/os-proc.c
		2	--- b/bsd-user/freebsd/os-proc.c
		3	@@ -83,7 +83,7 @@ out:
		4	}
		5
		6	static int
		7	-is_target_shell_script(int fd, char *interp, size_t size)
		8	+is_target_shell_script(int fd, char interp, size_t size, char *interp_args)
		9	{
		10	char buf[2], p, b;
		11	ssize_t n;
		12	@@ -120,7 +120,21 @@ is_target_shell_script(int fd, char *int
		13	return 0;
		14	}
		15	if ((p = memchr(b, '\n', size)) != NULL) {
		16	+ int hasargs = 0;
		17	*p = 0;
		18	+
		19	+ *interp_args = NULL;
		20	+ p = interp;
		21	+ while (*p) {
		22	+ if ((p == ' ') \|\| (p == '\t')) {
		23	+ hasargs = 1;
		24	+ *p = 0;
		25	+ } else if (hasargs) {
		26	+ *interp_args = p;
		27	+ break;
		28	+ }
		29	+ ++p;
		30	+ }
		31	return 1;
		32	}
		33	b += n;
		34	@@ -136,7 +150,7 @@ is_target_shell_script(int fd, char *int
		35	abi_long freebsd_exec_common(abi_ulong path_or_fd, abi_ulong guest_argp,
		36	abi_ulong guest_envp, int do_fexec)
		37	{
		38	- char argp, envp, qargp, qarg1, **qarg0;
		39	+ char argp, envp, qargp, qarg1, qarg0, qargend;
		40	int argc, envc;
		41	abi_ulong gp;
		42	abi_ulong addr;
		43	@@ -166,7 +180,7 @@ abi_long freebsd_exec_common(abi_ulong p
		44	envc++;
		45	}
		46
		47	- qarg0 = argp = alloca((argc + 4) * sizeof(void *));
		48	+ qarg0 = argp = alloca((argc + 5) * sizeof(void *));
		49	/* save the first agrument for the emulator */
		50	argp++ = (char )getprogname();
		51	qargp = argp;
		52	@@ -188,7 +202,8 @@ abi_long freebsd_exec_common(abi_ulong p
		53	}
		54	total_size += strlen(*q) + 1;
		55	}
		56	- *q = NULL;
		57	+ *q++ = NULL;
		58	+ qargend = q;
		59
		60	for (gp = guest_envp, q = envp; gp; gp += sizeof(abi_ulong), q++) {
		61	if (get_user_ual(addr, gp)) {
		62	@@ -217,7 +232,7 @@ abi_long freebsd_exec_common(abi_ulong p
		63	}
		64
65	if (do_fexec) {
66	- char execpath[PATH_MAX];
67	+ char execpath[PATH_MAX], *scriptargs;
68
69	if (((int)path_or_fd > 0 &&
70	is_target_elf_binary((int)path_or_fd)) == 1) {
71	@@ -238,7 +253,7 @@ abi_long freebsd_exec_common(abi_ulong p
72	goto execve_end;
73	}
74	} else if (is_target_shell_script((int)path_or_fd, execpath,
75	- sizeof(execpath)) != 0) {
76	+ sizeof(execpath), &scriptargs) != 0) {
77	char scriptpath[PATH_MAX];
78
79	/* execve() as a target script using emulator. */
80	@@ -246,6 +261,10 @@ abi_long freebsd_exec_common(abi_ulong p
81	sizeof(scriptpath)) != NULL) {
82	*qargp = execpath;
83	*qarg1 = scriptpath;
84	+ if (scriptargs) {
85	+ memmove(qarg1 + 1, qarg1, (qargend-qarg1) * sizeof(*qarg1));
86	+ *qarg1 = scriptargs;
87	+ }
88	ret = get_errno(execve(qemu_proc_pathname, qarg0, envp));
89	} else {
90	ret = -TARGET_EBADF;
91	@@ -256,7 +275,7 @@ abi_long freebsd_exec_common(abi_ulong p
92	}
93	} else {
94	int fd;
95	- char execpath[PATH_MAX];
96	+ char execpath[PATH_MAX], *scriptargs;
97
98	p = lock_user_string(path_or_fd);
99	if (p == NULL) {
100	@@ -275,11 +294,15 @@ abi_long freebsd_exec_common(abi_ulong p
101	qarg1 = (char )p;
102	ret = get_errno(execve(qemu_proc_pathname, qargp, envp));
103	} else if (is_target_shell_script(fd, execpath,
104	- sizeof(execpath)) != 0) {
105	+ sizeof(execpath), &scriptargs) != 0) {
106	close(fd);
107	/* execve() as a target script using emulator. */
108	*qargp = execpath;
109	qarg1 = (char )p;
110	+ if (scriptargs) {
111	+ memmove(qarg1 + 1, qarg1, (qargend-qarg1) * sizeof(*qarg1));
112	+ *qarg1 = scriptargs;
113	+ }
114	ret = get_errno(execve(qemu_proc_pathname, qarg0, envp));
115	} else {
116	close(fd);