Code cleanup
This commit is contained in:
parent
17c0fae701
commit
f740fb5336
25
src/cp.c
25
src/cp.c
|
@ -79,6 +79,18 @@ static int _cp_error(char const * message, int ret)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int _single_confirm(char const * message)
|
||||||
|
{
|
||||||
|
int c;
|
||||||
|
int tmp;
|
||||||
|
|
||||||
|
fprintf(stderr, "%s%s%s", "cp: ", message, ": Overwrite? ");
|
||||||
|
if((c = fgetc(stdin)) == EOF)
|
||||||
|
return 0;
|
||||||
|
while(c != '\n' && (tmp = fgetc(stdin)) != EOF && tmp != '\n');
|
||||||
|
return c == 'y';
|
||||||
|
}
|
||||||
|
|
||||||
/* _cp_single */
|
/* _cp_single */
|
||||||
static int _single_dir(Prefs * prefs, char const * src, char const * dst);
|
static int _single_dir(Prefs * prefs, char const * src, char const * dst);
|
||||||
static FILE * _single_open_dst(Prefs * prefs, char const * dst);
|
static FILE * _single_open_dst(Prefs * prefs, char const * dst);
|
||||||
|
@ -203,7 +215,6 @@ static int _single_recurse(Prefs * prefs, char const * src, char const * dst)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _single_confirm(char const * message);
|
|
||||||
static FILE * _single_open_dst(Prefs * prefs, char const * dst)
|
static FILE * _single_open_dst(Prefs * prefs, char const * dst)
|
||||||
{
|
{
|
||||||
FILE * fp;
|
FILE * fp;
|
||||||
|
@ -236,18 +247,6 @@ static FILE * _single_open_dst(Prefs * prefs, char const * dst)
|
||||||
return fp;
|
return fp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _single_confirm(char const * message)
|
|
||||||
{
|
|
||||||
int c;
|
|
||||||
int tmp;
|
|
||||||
|
|
||||||
fprintf(stderr, "%s%s%s", "cp: ", message, ": Overwrite? ");
|
|
||||||
if((c = fgetc(stdin)) == EOF)
|
|
||||||
return 0;
|
|
||||||
while(c != '\n' && (tmp = fgetc(stdin)) != EOF && tmp != '\n');
|
|
||||||
return c == 'y';
|
|
||||||
}
|
|
||||||
|
|
||||||
static int _cp_symlink(char const * src, char const * dst)
|
static int _cp_symlink(char const * src, char const * dst)
|
||||||
{
|
{
|
||||||
char buf[PATH_MAX + 1];
|
char buf[PATH_MAX + 1];
|
||||||
|
|
Loading…
Reference in New Issue
Block a user