d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make concat() accept NULL arguments.

Browse Source 
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2015-03-12 12:17:15 +00:00
parent 5c16a48aec
commit 4d58da13af
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=279915
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/autofs/automount.c
View File

@ -345,11 +345,7 @@ main_automount(int argc, char **argv)
force_unmount = true;
break;
case 'o':
if (options == NULL) {
options = checked_strdup(optarg);
} else {
options = concat(options, ',', optarg);
}
options = concat(options, ',', optarg);
break;
case 'u':
do_unmount = true;
@ -385,9 +381,7 @@ main_automount(int argc, char **argv)
parse_master(root, AUTO_MASTER_PATH);
if (show_maps) {
if (options != NULL) {
root->n_options = concat(options, ',', root->n_options);
}
root->n_options = concat(options, ',', root->n_options);
if (show_maps > 1) {
node_expand_indirect_maps(root);
node_expand_ampersand(root, NULL);

9
usr.sbin/autofs/automountd.c
View File

@ -241,8 +241,7 @@ handle_request(const struct autofs_daemon_request *adr, char *cmdline_options,
/*
* Prepend options passed via automountd(8) command line.
*/
if (cmdline_options != NULL)
options = concat(cmdline_options, ',', options);
options = concat(cmdline_options, ',', options);
if (node->n_location == NULL) {
log_debugx("found node defined at %s:%d; not a mountpoint",
@ -455,11 +454,7 @@ main_automountd(int argc, char **argv)
maxproc = atoi(optarg);
break;
case 'o':
if (options == NULL) {
options = checked_strdup(optarg);
} else {
options = concat(options, ',', optarg);
}
options = concat(options, ',', optarg);
break;
case 'v':
debug++;

6
usr.sbin/autofs/common.c
View File

@ -94,8 +94,10 @@ concat(const char *s1, char separator, const char *s2)
char *result;
int ret;
assert(s1 != NULL);
assert(s2 != NULL);
if (s1 == NULL)
s1 = "";
if (s2 == NULL)
s2 = "";
/*
* If s2 starts with separator - skip it; otherwise concatenating