X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnowsbr.c;h=d54877e343cf1bfd08b28b938ae93af11a297453;hb=9b70e8396d50989db2177547515594bc15ee8b17;hp=121a79baa43b0333b493ecb82179ca0a7ecc0206;hpb=72a97a2e44a300808b5584bd3d3581162b107b03;p=mmh

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 121a79b..d54877e 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -97,7 +97,7 @@ static struct swit aleqs[] = {
 #define	PWDCMDSW		      11
     { "pwd", 0 },
 #define	LSCMDSW			      12
-    { "ls", 0 },
+    { "ls", 2 },
 #define	ATTACHCMDSW		      13
     { "attach", 0 },
 #define	DETACHCMDSW		      14
@@ -120,7 +120,7 @@ static int buildfile (char **, char *);
 static int check_draft (char *);
 static int whomfile (char **, char *);
 static int removefile (char *);
-static void writelscmd(char *, int, char **);
+static void writelscmd(char *, int, char *, char **);
 static void writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp);
 static FILE* popen_in_dir(const char *dir, const char *cmd, const char *type);
 static int system_in_dir(const char *dir, const char *cmd);
@@ -336,7 +336,7 @@ WhatNow (int argc, char **argv)
 	     */
 
 	    if (*(argp+1) == (char *)0) {
-		(void)sprintf(buf, "$SHELL -c \"cd;pwd\"");
+		(void)sprintf(buf, "$SHELL -c \"cd&&pwd\"");
 	    }
 	    else {
 		writesomecmd(buf, BUFSIZ, "cd", "pwd", argp);
@@ -366,7 +366,7 @@ WhatNow (int argc, char **argv)
 	     *	Use the user's shell so that we can take advantage of any
 	     *	syntax that the user is accustomed to.
 	     */
-	    writelscmd(buf, sizeof(buf), argp);
+	    writelscmd(buf, sizeof(buf), "", argp);
 	    (void)system_in_dir(cwd, buf);
 	    break;
 
@@ -431,7 +431,7 @@ WhatNow (int argc, char **argv)
 	     *	Build a command line that causes the user's shell to list the file name
 	     *	arguments.  This handles and wildcard expansion, tilde expansion, etc.
 	     */
-	    writelscmd(buf, sizeof(buf), argp);
+	    writelscmd(buf, sizeof(buf), "-d", argp);
 
 	    /*
 	     *	Read back the response from the shell, which contains a number of lines
@@ -520,7 +520,7 @@ WhatNow (int argc, char **argv)
 	     * We feed all the file names to the shell at once, otherwise you can't
 	     * provide a file name with a space in it.
 	     */
-	    writelscmd(buf, sizeof(buf), argp);
+	    writelscmd(buf, sizeof(buf), "-d", argp);
 	    if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
 		while (fgets(shell, sizeof (shell), f) != (char *)0) {
 		    *(strchr(shell, '\n')) = '\0';
@@ -561,9 +561,9 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
      * new C99 mandated 'number of chars that would have been written'
      */
     /* length checks here and inside the loop allow for the
-     * trailing ';', trailcmd, '"' and NUL
+     * trailing "&&", trailcmd, '"' and NUL
      */
-    int trailln = strlen(trailcmd) + 3;
+    int trailln = strlen(trailcmd) + 4;
     if (ln < 0 || ln + trailln > bufsz)
 	adios((char *)0, "arguments too long");
     
@@ -579,9 +579,9 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
 	cp += ln;
     }
     if (*trailcmd) {
-	*cp++ = ';';
+	*cp++ = '&'; *cp++ = '&';
 	strcpy(cp, trailcmd);
-	cp += trailln - 3;
+	cp += trailln - 4;
     }
     *cp++ = '"';
     *cp = 0;
@@ -592,9 +592,11 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
  * arguments.  This handles and wildcard expansion, tilde expansion, etc.
  */
 static void
-writelscmd(char *buf, int bufsz, char **argp)
+writelscmd(char *buf, int bufsz, char *lsoptions, char **argp)
 {
-    writesomecmd(buf, bufsz, "ls", "", argp);
+  char *lscmd = concat ("ls ", lsoptions, " --", NULL);
+  writesomecmd(buf, bufsz, lscmd, "", argp);
+  free (lscmd);
 }
 
 /* Like system(), but run the command in directory dir.