summaryrefslogtreecommitdiff
path: root/sftp-int.c
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2001-02-05 12:42:17 +0000
committerKevin Steves <stevesk@pobox.com>2001-02-05 12:42:17 +0000
commitef4eea9badfb65f05ac24f786b710cc3f27f0e43 (patch)
treef54abef181ccd6ad5285a5c16b4c159d8b74e932 /sftp-int.c
parentd2ddda4efab29fd8663757634773fa10e557e0f3 (diff)
- stevesk@cvs.openbsd.org 2001/02/04 08:32:27
[many files; did this manually to our top-level source dir] unexpand and remove end-of-line whitespace; ok markus@
Diffstat (limited to 'sftp-int.c')
-rw-r--r--sftp-int.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sftp-int.c b/sftp-int.c
index bdb470b1c..9ec5b9712 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -130,10 +130,10 @@ local_do_shell(const char *args)
130 int ret, status; 130 int ret, status;
131 char *shell; 131 char *shell;
132 pid_t pid; 132 pid_t pid;
133 133
134 if (!*args) 134 if (!*args)
135 args = NULL; 135 args = NULL;
136 136
137 if ((shell = getenv("SHELL")) == NULL) 137 if ((shell = getenv("SHELL")) == NULL)
138 shell = _PATH_BSHELL; 138 shell = _PATH_BSHELL;
139 139
@@ -149,7 +149,7 @@ local_do_shell(const char *args)
149 debug3("Executing %s", shell); 149 debug3("Executing %s", shell);
150 ret = execl(shell, shell, NULL); 150 ret = execl(shell, shell, NULL);
151 } 151 }
152 fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell, 152 fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell,
153 strerror(errno)); 153 strerror(errno));
154 _exit(1); 154 _exit(1);
155 } 155 }
@@ -161,7 +161,7 @@ local_do_shell(const char *args)
161 error("Shell exited with status %d", WEXITSTATUS(status)); 161 error("Shell exited with status %d", WEXITSTATUS(status));
162} 162}
163 163
164void 164void
165local_do_ls(const char *args) 165local_do_ls(const char *args)
166{ 166{
167 if (!args || !*args) 167 if (!args || !*args)
@@ -367,7 +367,7 @@ parse_args(const char **cpp, int *pflag, unsigned long *n_arg,
367 if (get_pathname(&cp, path1)) 367 if (get_pathname(&cp, path1))
368 return(-1); 368 return(-1);
369 if (*path1 == NULL) { 369 if (*path1 == NULL) {
370 error("You must specify a path after a %s command.", 370 error("You must specify a path after a %s command.",
371 cmd); 371 cmd);
372 return(-1); 372 return(-1);
373 } 373 }
@@ -403,7 +403,7 @@ parse_args(const char **cpp, int *pflag, unsigned long *n_arg,
403 if (get_pathname(&cp, path1)) 403 if (get_pathname(&cp, path1))
404 return(-1); 404 return(-1);
405 if (*path1 == NULL) { 405 if (*path1 == NULL) {
406 error("You must specify a path after a %s command.", 406 error("You must specify a path after a %s command.",
407 cmd); 407 cmd);
408 return(-1); 408 return(-1);
409 } 409 }