bin/16393: /bin/sh doesn't strip comments on shebang line

--- /usr/src/sys/kern/imgact_shell.c~    Wed Feb  9 17:14:09 2000
+++ /usr/src/sys/kern/imgact_shell.c     Wed Feb  9 17:14:13 2000
@@ -51,6 +51,7 @@
 exec_shell_imgact(imgp)
         struct image_params *imgp;
 {
+        const char *comment = NULL;
         const char *image_header = imgp->image_header;
         const char *ihp, *line_endp;
         char *interp;
@@ -112,7 +113,15 @@
                          *      because this is at the front of the string buffer
                          *      and the maximum shell command length is tiny.
                          */
-                        while ((ihp < line_endp) && (*ihp != ' ') && (*ihp != '\t')) {
+                        while ((ihp < line_endp) &&
+                            ((*ihp != ' ') && (*ihp != '\t') || comment)) {
+
+                                /* Shell comment characters at the start of a token cause
+                                 *      everything to EOL to be one token.
+                                 */
+                                if (*ihp == '#')
+                                        comment = ihp;
+
                                 *imgp->stringp++ = *ihp++;
                                 imgp->stringspace--;
                         }


--- /usr/src/bin/sh/options.c~   Thu Feb 10 11:02:38 2000


+++ /usr/src/bin/sh/options.c    Thu Feb 10 13:41:10 2000
@@ -108,6 +108,15 @@
                         optlist[i].val = 0;
         arg0 = argv[0];
         if (sflag == 0 && minusc == NULL) {
+                /* Skip any arguments that start with shell-comment character
+                 *      since it is unlikely the filename of a script given on
+                 *      the command line will start with one.
+                 */
+                while (*argptr && **argptr == '#')
+                {
+                        argptr++;
+                }
+
                 commandname = arg0 = *argptr++;
                 setinputfile(commandname, 0);
         }