From 065569b69639590ccfef1a8206ad51d1bad0fa47 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Thu, 6 Nov 1997 17:51:54 +0000 Subject: [PATCH] Add extra parameter to recvrequest, specifying if local filenames should be parsed as "-" and "|". git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3804 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/ftp/ftp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/appl/ftp/ftp/ftp.c b/appl/ftp/ftp/ftp.c index 797fad0f8..60b8ce5be 100644 --- a/appl/ftp/ftp/ftp.c +++ b/appl/ftp/ftp/ftp.c @@ -832,7 +832,8 @@ abortrecv(int sig) } void -recvrequest(char *cmd, char *local, char *remote, char *lmode, int printnames) +recvrequest(char *cmd, char *local, char *remote, + char *lmode, int printnames, int local_given) { FILE *fout, *din = 0; int (*closefunc) (FILE *); @@ -873,7 +874,7 @@ recvrequest(char *cmd, char *local, char *remote, char *lmode, int printnames) return; } oldintr = signal(SIGINT, abortrecv); - if (strcmp(local, "-") && *local != '|') { + if (!local_given || (strcmp(local, "-") && *local != '|')) { if (access(local, 2) < 0) { char *dir = strrchr(local, '/'); @@ -945,9 +946,9 @@ recvrequest(char *cmd, char *local, char *remote, char *lmode, int printnames) if (din == NULL) goto abort; set_buffer_size(fileno(din), 1); - if (strcmp(local, "-") == 0) + if (local_given && strcmp(local, "-") == 0) fout = stdout; - else if (*local == '|') { + else if (local_given && *local == '|') { oldintp = signal(SIGPIPE, SIG_IGN); fout = popen(local + 1, "w"); if (fout == NULL) {