6543/davfs2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add function cp_file to replace system

Browse Source
This commit is contained in:
wbaumann 2014-04-20 09:26:39 +00:00
parent b7866ea576
commit 8739bc32a8
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4,6 +4,8 @@ ChangeLog for davfs2
2014-04-20 Werner Baumann (werner.baumann@onlinehome.de) 2014-04-20 Werner Baumann (werner.baumann@onlinehome.de)
* kernel_interface.c: * kernel_interface.c:
Replace system() with execl(). Replace system() with execl().
* mount_davfs.c:
Add function cp_file to replace system.


2014-04-18 Werner Baumann (werner.baumann@onlinehome.de) 2014-04-18 Werner Baumann (werner.baumann@onlinehome.de)
* defaults.h, mount_davfs.h, mount_davfs.c, webdav.c: * defaults.h, mount_davfs.h, mount_davfs.c, webdav.c:

41
src/mount_davfs.c
View File

@ -176,6 +176,9 @@ write_mtab_entry(const dav_args *args);
static int static int
arg_to_int(const char *arg, int base, const char *opt); arg_to_int(const char *arg, int base, const char *opt);


static void
cp_file(const char *src, const char *dest);

static int static int
debug_opts(const char *s); debug_opts(const char *s);


@ -548,9 +551,7 @@ check_dirs(dav_args *args)
fname = xasprintf("%s/.%s/%s", args->home, PACKAGE, DAV_CONFIG); fname = xasprintf("%s/.%s/%s", args->home, PACKAGE, DAV_CONFIG);
if (stat(fname, &st) != 0) { if (stat(fname, &st) != 0) {
char *template = xasprintf("%s/%s", DAV_DATA_DIR, DAV_CONFIG); char *template = xasprintf("%s/%s", DAV_DATA_DIR, DAV_CONFIG);
char *command = xasprintf("cp %s %s", template, fname); cp_file(template, fname);
if (system(command) != 0);
free(command);
free(template); free(template);
} }
free(fname); free(fname);
@ -558,10 +559,8 @@ check_dirs(dav_args *args)
fname = xasprintf("%s/.%s/%s", args->home, PACKAGE, DAV_SECRETS); fname = xasprintf("%s/.%s/%s", args->home, PACKAGE, DAV_SECRETS);
if (stat(fname, &st) != 0) { if (stat(fname, &st) != 0) {
char *template = xasprintf("%s/%s", DAV_DATA_DIR, DAV_SECRETS); char *template = xasprintf("%s/%s", DAV_DATA_DIR, DAV_SECRETS);
char *command = xasprintf("cp %s %s", template, fname); cp_file(template, fname);
if (system(command) == 0) chmod(fname, S_IRUSR | S_IWUSR);
chmod(fname, S_IRUSR | S_IWUSR);
free(command);
free(template); free(template);
} }
free(fname); free(fname);
@ -1328,6 +1327,34 @@ arg_to_int(const char *arg, int base, const char *opt)
} }




/* Creates a copy of src with name dest. */
static void
cp_file(const char *src, const char *dest)
{
FILE *in = fopen(src, "r");
if (!in)
error(EXIT_FAILURE, errno, _("can't open file %s"), src);

FILE *out = fopen(dest, "w");
if (!out)
error(EXIT_FAILURE, errno, _("can't open file %s"), dest);

size_t n = 0;
char *line = NULL;
int length = getline(&line, &n, in);
while (length > 0) {
if (fputs(line, out) == EOF)
error(EXIT_FAILURE, errno, _("error writing to file %s"), dest);
length = getline(&line, &n, in);
}

if (line)
free(line);
fclose(out);
fclose(in);
}


/* Converts a debug option string s into numerical value. If s is not a /* Converts a debug option string s into numerical value. If s is not a
valid debug option, it returns 0. */ valid debug option, it returns 0. */
static int static int