svn commit: r283238 - stable/10/usr.sbin/autofs

[Edward Tomasz Napierala]

Author: trasz
Date: Thu May 21 13:36:00 2015
New Revision: 283238
URL: https://svnweb.freebsd.org/changeset/base/283238

Log:
  MFC r279915:
  
  Make concat() accept NULL arguments.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/autofs/automount.c
  stable/10/usr.sbin/autofs/automountd.c
  stable/10/usr.sbin/autofs/common.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/autofs/automount.c
==============================================================================
--- stable/10/usr.sbin/autofs/automount.c	Thu May 21 13:34:33 2015	(r283237)
+++ stable/10/usr.sbin/autofs/automount.c	Thu May 21 13:36:00 2015	(r283238)
@@ -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);

Modified: stable/10/usr.sbin/autofs/automountd.c
==============================================================================
--- stable/10/usr.sbin/autofs/automountd.c	Thu May 21 13:34:33 2015	(r283237)
+++ stable/10/usr.sbin/autofs/automountd.c	Thu May 21 13:36:00 2015	(r283238)
@@ -241,8 +241,7 @@ handle_request(const struct autofs_daemo
 	/*
 	 * 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++;

Modified: stable/10/usr.sbin/autofs/common.c
==============================================================================
--- stable/10/usr.sbin/autofs/common.c	Thu May 21 13:34:33 2015	(r283237)
+++ stable/10/usr.sbin/autofs/common.c	Thu May 21 13:36:00 2015	(r283238)
@@ -94,8 +94,10 @@ concat(const char *s1, char separator, c
 	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