aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2020-08-30 01:04:13 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2020-08-30 01:04:13 -0400
commitd78ce54261fb4d48ba172faae8a64552a53341a4 (patch)
tree1d607fea3c0a413e2663f5ca01ebffbb957db84a
parent1eb6f0a3e5d1adf72e8deb30205b9bdc8333a0a8 (diff)
downloadmultihome-d78ce54261fb4d48ba172faae8a64552a53341a4.tar.gz
Use global tranfer config
-rw-r--r--multihome.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/multihome.c b/multihome.c
index 55a0396..099a4c7 100644
--- a/multihome.c
+++ b/multihome.c
@@ -267,14 +267,12 @@ void write_init_script() {
*/
void user_transfer() {
FILE *fp;
- char config[PATH_MAX];
char rec[PATH_MAX];
size_t lineno;
- sprintf(config, "%s/transfer", multihome.config_dir);
memset(rec, '\0', PATH_MAX);
- fp = fopen(config, "r");
+ fp = fopen(multihome.config_transfer, "r");
if (fp == NULL) {
// doesn't exist or isn't readable. non-fatal.
return;
@@ -315,14 +313,14 @@ void user_transfer() {
// Ignore: bad lines without enough information
if (strlen(rec) < 3) {
- fprintf(stderr, "%s:%zu: Invalid format: %s\n", config, lineno, rec);
+ fprintf(stderr, "%s:%zu: Invalid format: %s\n", multihome.config_transfer, lineno, rec);
continue;
}
recptr = &rec[2];
if (*recptr == '/') {
- fprintf(stderr, "%s:%zu: Removing leading '/' from: %s\n", config, lineno, recptr);
+ fprintf(stderr, "%s:%zu: Removing leading '/' from: %s\n", multihome.config_transfer, lineno, recptr);
memmove(recptr, recptr + 1, strlen(recptr) + 1);
}
@@ -356,7 +354,7 @@ void user_transfer() {
}
break;
default:
- fprintf(stderr, "%s:%zu: Invalid type: %c\n", config, lineno, rec[0]);
+ fprintf(stderr, "%s:%zu: Invalid type: %c\n", multihome.config_transfer, lineno, rec[0]);
break;
}
}