[patch] Add the -p, --preen option

reiser4progs-fsck-preen.patch (text/plain), 2.54 KB, created by Roy Marples (RETIRED) on 2007-10-16 12:23:39 UTC

diff -ur a/doc/fsck.reiser4.8 b/doc/fsck.reiser4.8
--- a/doc/fsck.reiser4.8	2006-11-01 14:50:34 +0000
+++ b/doc/fsck.reiser4.8	2007-10-16 13:15:18 +0100
@@ -54,7 +54,7 @@
 ignored.
 .SH PLUGIN OPTIONS
 .TP
-.B -p, --print-profile
+.B --print-profile
 prints the plugin profile. This is the set of default plugins used for all
 parts of a filesystem -- format, nodes, files, directories, hashes, etc. If
 --override is specified, then prints modified plugins.
@@ -82,6 +82,10 @@
 .B -f, --force
 forces fsck to use whole disk, not block device or mounted partition.
 .TP
+.B -p, --preen
+automatically repair the filesystem. We do this by default, but need to
+include the option so we're compatible with other fsck tools.
+.TP
 .B -c, --cache N
 tunes number of nodes in the libreiser4 tree buffer cache
 .RS
diff -ur a/progs/fsck/fsck.c b/progs/fsck/fsck.c
--- a/progs/fsck/fsck.c	2006-11-01 14:50:34 +0000
+++ b/progs/fsck/fsck.c	2007-10-16 13:20:37 +0100
@@ -28,7 +28,7 @@
 		"  -q, --quiet                   supresses gauges\n"
 		"  -r                            ignored\n"
 		"Plugins options:\n"
-		"  -p, --print-profile           prints the plugin profile.\n"
+		"  --print-profile               prints the plugin profile.\n"
 		"  -l, --print-plugins           prints all known plugins.\n"
 		"  -o, --override TYPE=PLUGIN    overrides the default plugin of the type\n"
 	        "                                \"TYPE\" by the plugin \"PLUGIN\" in the\n"
@@ -39,6 +39,7 @@
 		"  -y, --yes                     assumes an answer 'yes' to all questions.\n"
 		"  -f, --force                   makes fsck to use whole disk, not block\n"
 		"                                device or mounted partition.\n"
+		"  -p, --preen                   automatically repair the filesysem.\n"
 		"  -c, --cache N                 number of nodes in tree buffer cache\n");
 }
 
@@ -140,6 +141,7 @@
 		{"no-log", no_argument, NULL, 'n'},
 		{"auto", no_argument, NULL, 'a'},
 		{"force", no_argument, NULL, 'f'},
+		{"preen", no_argument, NULL, 'p'},
 		{"cache", required_argument, 0, 'c'},
 		{"override", required_argument, NULL, 'o'},
 		/* Fsck hidden options. */
@@ -203,6 +205,8 @@
 		case 'q':
 			aux_gauge_set_handler(NULL, GT_PROGRESS);
 			break;
+		case 'p':
+			/* Fall through as preen should fix errors */
 		case 'y':
 			aal_set_bit(&data->options, FSCK_OPT_YES);
 			break;
@@ -226,9 +230,6 @@
 		case 'l':
 			mode = RM_SHOW_PLUG;
 			break;
-		case 'p':
-			mode = RM_SHOW_PARM;
-			break;
 		case 'o':
 			aal_strncat(override, optarg, aal_strlen(optarg));
 			aal_strncat(override, ",", 1);