midfavila/sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Revert "enmasse: For the special case of 2 args, do not distinguish between dirs and files"

Browse Source 
This reverts commit a564a67c4ea70e90a4dc543814458e4903869d3e.

Not as trivial as I thought.  This breaks cp when used as:
cp -r /foo/bar /baz

The old code expands this to:
cp -r /foo/bar /baz/bar
This commit is contained in:
sin 2015-11-13 14:29:23 +00:00
parent 4c1f9ecdd2
commit d24584466c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libutil/enmasse.c
View File

@ -3,6 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include "../util.h" #include "../util.h"
@ -10,11 +11,12 @@
void void
enmasse(int argc, char *argv[], int (*fn)(const char *, const char *, int)) enmasse(int argc, char *argv[], int (*fn)(const char *, const char *, int))
{ {
struct stat st;
char buf[PATH_MAX], *dir; char buf[PATH_MAX], *dir;
int i, len; int i, len;
size_t dlen; size_t dlen;
if (argc == 2) { if (argc == 2 && !(stat(argv[1], &st) == 0 && S_ISDIR(st.st_mode))) {
fnck(argv[0], argv[1], fn, 0); fnck(argv[0], argv[1], fn, 0);
return; return;
} else { } else {