fstabinto now behaves more like mountinfo with respect to --quiet
This commit is contained in:
		| @@ -21,7 +21,7 @@ do_mtab() { | ||||
| 	# Now make sure /etc/mtab have additional info (gid, etc) in there | ||||
| 	local mnt= | ||||
| 	mountinfo | while read mnt; do | ||||
| 		if fstabinfo --quiet --mountcmd "${mnt}"; then | ||||
| 		if fstabinfo --quiet "${mnt}"; then | ||||
| 			mount -f -o remount "${mnt}" | ||||
| 		fi | ||||
| 	done | ||||
|   | ||||
| @@ -96,7 +96,7 @@ int fstabinfo (int argc, char **argv) | ||||
| #else | ||||
| 	struct fstab *ent; | ||||
| #endif | ||||
| 	int result = EXIT_FAILURE; | ||||
| 	int result = EXIT_SUCCESS; | ||||
| 	char *token; | ||||
| 	int i; | ||||
| 	int opt; | ||||
| @@ -162,13 +162,7 @@ int fstabinfo (int argc, char **argv) | ||||
| 	while (optind < argc) | ||||
| 		rc_strlist_add (&files, argv[optind++]); | ||||
|  | ||||
| 	if (! files) { | ||||
| 		if (filtered) { | ||||
| 			if (! rc_is_env ("RC_QUIET", "yes")) | ||||
| 				eerror ("%s: no matches found", argv[0]); | ||||
| 			exit (EXIT_FAILURE); | ||||
| 		} | ||||
|  | ||||
| 	if (! files && ! filtered) { | ||||
| 		START_ENT; | ||||
| 		while ((ent = GET_ENT)) | ||||
| 			rc_strlist_add (&files, ENT_FILE (ent)); | ||||
| @@ -182,12 +176,14 @@ int fstabinfo (int argc, char **argv) | ||||
| 	START_ENT; | ||||
| 	STRLIST_FOREACH (files, file, i) { | ||||
| 		if (! (ent = GET_ENT_FILE (file))) { | ||||
| 			if (! rc_is_env ("RC_QUIET", "yes")) | ||||
| 				eerror ("%s: no such entry `%s'", argv[0], file); | ||||
| 			result = EXIT_FAILURE; | ||||
| 			continue; | ||||
| 		} | ||||
|  | ||||
| 		/* No point in outputting if quiet */ | ||||
| 		if (rc_is_env ("RC_QUIET", "yes")) | ||||
| 			continue; | ||||
|  | ||||
| 		switch (output) { | ||||
| 			case OUTPUT_MOUNTCMD: | ||||
| 				printf ("-o %s -t %s %s %s\n", ENT_OPTS (ent), ENT_TYPE (ent), | ||||
|   | ||||
| @@ -83,7 +83,7 @@ static int process_mount (char ***list, struct args *args, | ||||
| 		regexec (args->skip_options_regex, options, 0, NULL, 0) == 0) | ||||
| 		return (-1); | ||||
|  | ||||
| 	if (args->mounts)   { | ||||
| 	if (args->mounts) { | ||||
| 		bool found = false; | ||||
| 		int j; | ||||
| 		char *mnt; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user