| 1 | diff --git a/libncftp/lglob.c b/libncftp/lglob.c
|
| 2 | index e374f0c..2d74cd5 100644
|
| 3 | |
| 4 | |
| 5 | @@ -137,11 +137,11 @@ LazyUnixLocalGlob(FTPCIPtr cip, FTPLineListPtr fileList, const char *const patte
|
| 6 | * work for us.
|
| 7 | */
|
| 8 | #ifdef HAVE_SNPRINTF
|
| 9 | - (void) snprintf(cmd, sizeof(cmd) - 1, "%s -c \"%s %s %s\"", "/bin/sh", "/bin/ls",
|
| 10 | + (void) snprintf(cmd, sizeof(cmd) - 1, "%s -c \"%s %s %s\"", "sh", "ls",
|
| 11 | "-d", pattern);
|
| 12 | cmd[sizeof(cmd) - 1] = '\0';
|
| 13 | #else
|
| 14 | - (void) sprintf(cmd, "%s -c \"%s %s %s\"", "/bin/sh", "/bin/ls",
|
| 15 | + (void) sprintf(cmd, "%s -c \"%s %s %s\"", "sh", "ls",
|
| 16 | "-d", pattern);
|
| 17 | #endif
|
| 18 |
|
| 19 | diff --git a/ncftp/cmds.c b/ncftp/cmds.c
|
| 20 | index 241c7c5..228fb0a 100644
|
| 21 | |
| 22 | |
| 23 | @@ -2031,7 +2031,7 @@ LocalListCmd(const int argc, char **const argv, const CommandPtr cmdp, const Arg
|
| 24 | (void) fflush(stdin);
|
| 25 | outfp = OpenPager();
|
| 26 |
|
| 27 | - (void) STRNCPY(incmd, "/bin/ls");
|
| 28 | + (void) STRNCPY(incmd, "ls");
|
| 29 | for (i=1, dashopts=0; i<argc; i++) {
|
| 30 | (void) STRNCAT(incmd, " ");
|
| 31 | if (argv[i][0] == '-')
|
| 32 | @@ -2040,7 +2040,7 @@ LocalListCmd(const int argc, char **const argv, const CommandPtr cmdp, const Arg
|
| 33 | }
|
| 34 |
|
| 35 | if (dashopts == 0) {
|
| 36 | - (void) STRNCPY(incmd, "/bin/ls -CF");
|
| 37 | + (void) STRNCPY(incmd, "ls -CF");
|
| 38 | for (i=1; i<argc; i++) {
|
| 39 | (void) STRNCAT(incmd, " ");
|
| 40 | (void) STRNCAT(incmd, argv[i]);
|
| 41 | @@ -2135,7 +2135,7 @@ void
|
| 42 | LocalChmodCmd(const int argc, char **const argv, const CommandPtr cmdp, const ArgvInfoPtr aip)
|
| 43 | {
|
| 44 | ARGSUSED(gUnusedArg);
|
| 45 | - Sys(argc, argv, aip, "/bin/chmod", 1);
|
| 46 | + Sys(argc, argv, aip, "chmod", 1);
|
| 47 | } /* LocalChmodCmd */
|
| 48 | #endif
|
| 49 |
|
| 50 | @@ -2156,7 +2156,7 @@ LocalMkdirCmd(const int argc, char **const argv, const CommandPtr cmdp, const Ar
|
| 51 | }
|
| 52 | #else
|
| 53 | ARGSUSED(gUnusedArg);
|
| 54 | - Sys(argc, argv, aip, "/bin/mkdir", 0);
|
| 55 | + Sys(argc, argv, aip, "mkdir", 0);
|
| 56 | #endif
|
| 57 | } /* LocalMkdirCmd */
|
| 58 |
|
| 59 | @@ -2185,7 +2185,7 @@ LocalRenameCmd(const int argc, char **const argv, const CommandPtr cmdp, const A
|
| 60 | }
|
| 61 | #else
|
| 62 | ARGSUSED(gUnusedArg);
|
| 63 | - Sys(argc, argv, aip, "/bin/mv", 1);
|
| 64 | + Sys(argc, argv, aip, "mv", 1);
|
| 65 | #endif
|
| 66 | } /* LocalRenameCmd */
|
| 67 |
|
| 68 | @@ -2219,7 +2219,7 @@ LocalRmCmd(const int argc, char **const argv, const CommandPtr cmdp, const ArgvI
|
| 69 | }
|
| 70 | #else
|
| 71 | ARGSUSED(gUnusedArg);
|
| 72 | - Sys(argc, argv, aip, "/bin/rm", 1);
|
| 73 | + Sys(argc, argv, aip, "rm", 1);
|
| 74 | #endif
|
| 75 | } /* LocalRmCmd */
|
| 76 |
|
| 77 | @@ -2253,7 +2253,7 @@ LocalRmdirCmd(const int argc, char **const argv, const CommandPtr cmdp, const Ar
|
| 78 | }
|
| 79 | #else
|
| 80 | ARGSUSED(gUnusedArg);
|
| 81 | - Sys(argc, argv, aip, "/bin/rmdir", 1);
|
| 82 | + Sys(argc, argv, aip, "rmdir", 1);
|
| 83 | #endif
|
| 84 | } /* LocalRmdirCmd */
|
| 85 |
|
| 86 | diff --git a/ncftp/util.c b/ncftp/util.c
|
| 87 | index 70a0808..2ece1a2 100644
|
| 88 | |
| 89 | |
| 90 | @@ -503,7 +503,7 @@ InitUserInfo(void)
|
| 91 |
|
| 92 | envp = getenv("SHELL");
|
| 93 | if (envp == NULL)
|
| 94 | - (void) STRNCPY(gShell, "/bin/sh");
|
| 95 | + (void) STRNCPY(gShell, "sh");
|
| 96 | else
|
| 97 | (void) STRNCPY(gShell, envp);
|
| 98 | } else {
|
| 99 | diff --git a/sh_util/ncftpls.c b/sh_util/ncftpls.c
|
| 100 | index ccbd03b..812e670 100644
|
| 101 | |
| 102 | |
| 103 | @@ -226,7 +226,7 @@ Usage(void)
|
| 104 | -R Long list format, recurse subdirectories if server allows it.\n\
|
| 105 | -g Recursive and print one path per line; like \"/usr/bin/find . -print\"\n\
|
| 106 | -gg As above, but append a \"/\" character to directory pathnames.\n\
|
| 107 | - -a Show all files, if server allows it (as in \"/bin/ls -a\").\n\
|
| 108 | + -a Show all files, if server allows it (as in \"ls -a\").\n\
|
| 109 | -i XX Filter the listing (if server supports it) with the wildcard XX.\n\
|
| 110 | -x XX List command flags to try on the remote server (without leading dash).\n");
|
| 111 | (void) fprintf(fp, "\nFTP Flags:\n\
|
| 112 | diff --git a/win/bmed/util.c b/win/bmed/util.c
|
| 113 | index d573a40..6456102 100644
|
| 114 | |
| 115 | |
| 116 | @@ -385,7 +385,7 @@ InitUserInfo(void)
|
| 117 |
|
| 118 | envp = getenv("SHELL");
|
| 119 | if (envp == NULL)
|
| 120 | - (void) STRNCPY(gShell, "/bin/sh");
|
| 121 | + (void) STRNCPY(gShell, "sh");
|
| 122 | (void) STRNCPY(gShell, envp);
|
| 123 | } else {
|
| 124 | /* Copy home directory. */
|
| 125 | --
|
| 126 | 2.49.0
|
| 127 |
|