DeforaOS/utils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get cp(1) and mv(1) closer together

Browse Source
This commit is contained in:
Pierre Pronchery 2018-01-30 01:12:48 +01:00
parent e9a349f55c
commit 25184440d5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cp.c
View File

@ -18,14 +18,14 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#include <limits.h>
#include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <dirent.h> #include <dirent.h>
#include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <libgen.h> #include <libgen.h>
#include <limits.h>
#include <errno.h> #include <errno.h>
/* constants */ /* constants */

14
src/mv.c
View File

@ -75,12 +75,12 @@ static int _mv_error(char const * message, int ret)
return ret; return ret;
} }
static int _mv_confirm(char const * dst) static int _mv_confirm(char const * message)
{ {
int c; int c;
int tmp; int tmp;
fprintf(stderr, "%s%s%s", PROGNAME ": ", dst, ": Overwrite? "); fprintf(stderr, "%s%s%s", PROGNAME ": ", message, ": Overwrite? ");
if((c = fgetc(stdin)) == EOF) if((c = fgetc(stdin)) == EOF)
return 0; return 0;
while(c != '\n' && (tmp = fgetc(stdin)) != EOF && tmp != '\n'); while(c != '\n' && (tmp = fgetc(stdin)) != EOF && tmp != '\n');
@ -137,8 +137,8 @@ static int _mv_single(Prefs * prefs, char const * src, char const * dst)
} }
/* _mv_single_dir */ /* _mv_single_dir */
static int _mv_single_recurse(Prefs * prefs, char const * src, static int _mv_single_recurse(Prefs * prefs, char const * src, char const * dst,
char const * dst, mode_t mode); mode_t mode);
static int _mv_single_dir(Prefs * prefs, char const * src, char const * dst, static int _mv_single_dir(Prefs * prefs, char const * src, char const * dst,
mode_t mode) mode_t mode)
@ -218,11 +218,11 @@ static int _mv_single_nod(char const * src, char const * dst, mode_t mode,
static int _mv_single_symlink(char const * src, char const * dst) static int _mv_single_symlink(char const * src, char const * dst)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
ssize_t i; ssize_t len;
if((i = readlink(src, buf, sizeof(buf) - 1)) == -1) if((len = readlink(src, buf, sizeof(buf) - 1)) == -1)
return _mv_error(src, 1); return _mv_error(src, 1);
buf[i] = '\0'; buf[len] = '\0';
if(symlink(buf, dst) != 0) if(symlink(buf, dst) != 0)
return _mv_error(dst, 1); return _mv_error(dst, 1);
if(unlink(src) != 0) if(unlink(src) != 0)