1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
|
From 357ab077198bfa6239fa62fd03a546da959ec756 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Thu, 19 Feb 2015 21:22:54 +0100
Subject: [PATCH 06/14] fsck.fat: Make -r option default
Default mode is now to interactively repair with the option to write
the changes back at the end (like the -r option) instead of the previous
default mode of interactively correcting but never writing back the
changes.
The -r option continues to be recognized by fsck.fat.
Signed-off-by: Andreas Bombe <aeb@debian.org>
---
manpages/de/fsck.fat.de.8 | 6 ++--
manpages/en/fsck.fat.8 | 5 +--
manpages/po/de/fsck.fat.8.po | 76 ++++++++++++++++++++------------------------
manpages/pot/fsck.fat.8.pot | 76 ++++++++++++++++++++------------------------
src/fsck.fat.c | 6 ++--
5 files changed, 76 insertions(+), 93 deletions(-)
diff --git a/manpages/de/fsck.fat.de.8 b/manpages/de/fsck.fat.de.8
index 1d96e23..f9d70b8 100644
--- a/manpages/de/fsck.fat.de.8
+++ b/manpages/de/fsck.fat.de.8
@@ -123,7 +123,8 @@ anything to the filesystem.
Same as (\fB\-a\fP), for compatibility with other *fsck.
.IP \fB\-r\fP 4
Interactively repair the filesystem. The user is asked for advice whenever
-there is more than one approach to fix an inconsistency.
+there is more than one approach to fix an inconsistency. This is the default
+mode and the option is only retained for backwards compatibility.
.IP \fB\-t\fP 4
Mark unreadable clusters as bad.
.IP \fB\-u\fP 4
@@ -143,9 +144,6 @@ Write changes to disk immediately.
.IP \fB\-y\fP 4
Same as \fB\-a\fP (automatically repair filesystem) for compatibility with other
fsck tools.
-.PP
-\fBNote:\fP If \fB\-a\fP and \fB\-r\fP are absent, the filesystem is only checked, but
-not repaired.
.SH "EXIT STATUS"
.IP 0 4
diff --git a/manpages/en/fsck.fat.8 b/manpages/en/fsck.fat.8
index 3d95dc8..8c54372 100644
--- a/manpages/en/fsck.fat.8
+++ b/manpages/en/fsck.fat.8
@@ -93,8 +93,7 @@ anything to the filesystem.
.IP "\fB\-p\fR" 4
Same as (\fB\-a\fR), for compatibility with other *fsck.
.IP "\fB\-r\fR" 4
-Interactively repair the filesystem. The user is asked for advice whenever
-there is more than one approach to fix an inconsistency.
+Interactively repair the filesystem. The user is asked for advice whenever there is more than one approach to fix an inconsistency. This is the default mode and the option is only retained for backwards compatibility.
.IP "\fB\-t\fR" 4
Mark unreadable clusters as bad.
.IP "\fB\-u\fR" 4
@@ -107,8 +106,6 @@ Perform a verification pass. The filesystem check is repeated after the first ru
Write changes to disk immediately.
.IP "\fB\-y\fR" 4
Same as \fB\-a\fR (automatically repair filesystem) for compatibility with other fsck tools.
-.PP
-\fBNote:\fR If \fB\-a\fR and \fB\-r\fR are absent, the filesystem is only checked, but not repaired.
.SH "EXIT STATUS"
.IP "0" 4
diff --git a/manpages/po/de/fsck.fat.8.po b/manpages/po/de/fsck.fat.8.po
index 3035906..7ca0bc1 100644
--- a/manpages/po/de/fsck.fat.8.po
+++ b/manpages/po/de/fsck.fat.8.po
@@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: dosfstools VERSION\n"
-"POT-Creation-Date: 2014-11-12 00:52+0100\n"
+"POT-Creation-Date: 2015-02-20 20:47+0100\n"
"PO-Revision-Date: 2013-06-06 09:34+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -56,30 +56,30 @@ msgid "OPTIONS"
msgstr ""
#. type: SH
-#: en/fatlabel.8:41 en/fsck.fat.8:128 en/mkfs.fat.8:78
+#: en/fatlabel.8:41 en/fsck.fat.8:125 en/mkfs.fat.8:78
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/fatlabel.8:45 en/fsck.fat.8:132
+#: en/fatlabel.8:45 en/fsck.fat.8:129
msgid "B<mkfs.fat>(8)"
msgstr ""
#. type: SH
-#: en/fatlabel.8:46 en/fsck.fat.8:133 en/mkfs.fat.8:83
+#: en/fatlabel.8:46 en/fsck.fat.8:130 en/mkfs.fat.8:83
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: SH
-#: en/fatlabel.8:49 en/fsck.fat.8:136 en/mkfs.fat.8:86
+#: en/fatlabel.8:49 en/fsck.fat.8:133 en/mkfs.fat.8:86
#, no-wrap
msgid "AUTHORS"
msgstr ""
#. type: Plain text
-#: en/fatlabel.8:50 en/fsck.fat.8:137 en/mkfs.fat.8:87
+#: en/fatlabel.8:50 en/fsck.fat.8:134 en/mkfs.fat.8:87
msgid ""
"B<dosfstools> were written by Werner Almesberger E<lt>I<werner."
"almesberger@lrc.di.epfl.ch>E<gt>, Roman Hodek E<lt>I<Roman.Hodek@informatik."
@@ -365,31 +365,32 @@ msgid "B<-r>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:98
+#: en/fsck.fat.8:97
msgid ""
"Interactively repair the filesystem. The user is asked for advice whenever "
-"there is more than one approach to fix an inconsistency."
+"there is more than one approach to fix an inconsistency. This is the default "
+"mode and the option is only retained for backwards compatibility."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:98
+#: en/fsck.fat.8:97
#, no-wrap
msgid "B<-t>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:100
+#: en/fsck.fat.8:99
msgid "Mark unreadable clusters as bad."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:100
+#: en/fsck.fat.8:99
#, no-wrap
msgid "B<-u>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:102
+#: en/fsck.fat.8:101
msgid ""
"Try to undelete the specified file. B<fsck.fat> tries to allocate a chain of "
"contiguous unallocated clusters beginning with the start cluster of the "
@@ -397,24 +398,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/fsck.fat.8:102 en/mkfs.fat.8:72
+#: en/fsck.fat.8:101 en/mkfs.fat.8:72
#, no-wrap
msgid "B<-v>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:104
+#: en/fsck.fat.8:103
msgid "Verbose mode. Generates slightly more output."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:104
+#: en/fsck.fat.8:103
#, no-wrap
msgid "B<-V>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:106
+#: en/fsck.fat.8:105
msgid ""
"Perform a verification pass. The filesystem check is repeated after the "
"first run. The second pass should never report any fixable errors. It may "
@@ -424,91 +425,84 @@ msgid ""
msgstr ""
#. type: IP
-#: en/fsck.fat.8:106
+#: en/fsck.fat.8:105
#, no-wrap
msgid "B<-w>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:108
+#: en/fsck.fat.8:107
msgid "Write changes to disk immediately."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:108
+#: en/fsck.fat.8:107
#, no-wrap
msgid "B<-y>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:110
+#: en/fsck.fat.8:109
msgid ""
"Same as B<-a> (automatically repair filesystem) for compatibility with other "
"fsck tools."
msgstr ""
-#. type: Plain text
-#: en/fsck.fat.8:112
-msgid ""
-"B<Note:> If B<-a> and B<-r> are absent, the filesystem is only checked, but "
-"not repaired."
-msgstr ""
-
#. type: SH
-#: en/fsck.fat.8:113
+#: en/fsck.fat.8:110
#, no-wrap
msgid "EXIT STATUS"
msgstr ""
#. type: IP
-#: en/fsck.fat.8:114
+#: en/fsck.fat.8:111
#, no-wrap
msgid "0"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:116
+#: en/fsck.fat.8:113
msgid "No recoverable errors have been detected."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:116
+#: en/fsck.fat.8:113
#, no-wrap
msgid "1"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:118
+#: en/fsck.fat.8:115
msgid ""
"Recoverable errors have been detected or B<fsck.fat> has discovered an "
"internal inconsistency."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:118
+#: en/fsck.fat.8:115
#, no-wrap
msgid "2"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:120
+#: en/fsck.fat.8:117
msgid "Usage error. B<fsck.fat> did not access the filesystem."
msgstr ""
#. type: SH
-#: en/fsck.fat.8:121
+#: en/fsck.fat.8:118
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/fsck.fat.8:122
+#: en/fsck.fat.8:119
#, no-wrap
msgid "fsck0000.rec, fsck0001.rec, ..."
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:124
+#: en/fsck.fat.8:121
msgid ""
"When recovering from a corrupted filesystem, B<fsck.fat> dumps recovered "
"data into files named 'fsckNNNN.rec' in the top level directory of the "
@@ -516,13 +510,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/fsck.fat.8:125 en/mkfs.fat.8:75
+#: en/fsck.fat.8:122 en/mkfs.fat.8:75
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:127
+#: en/fsck.fat.8:124
msgid ""
"Does not create . and .. files where necessary. Does not remove entirely "
"empty directories. Should give more diagnostic messages. Undeleting files "
@@ -530,12 +524,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:130 en/mkfs.fat.8:80
+#: en/fsck.fat.8:127 en/mkfs.fat.8:80
msgid "B<fatlabel>(8)"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:135 en/mkfs.fat.8:85
+#: en/fsck.fat.8:132 en/mkfs.fat.8:85
msgid ""
"More information about B<fsck.fat> and B<dosfstools> can be found at "
"E<lt>I<http://daniel-baumann.ch/software/dosfstools/>E<gt>."
diff --git a/manpages/pot/fsck.fat.8.pot b/manpages/pot/fsck.fat.8.pot
index e411819..f5ca313 100644
--- a/manpages/pot/fsck.fat.8.pot
+++ b/manpages/pot/fsck.fat.8.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: dosfstools VERSION\n"
-"POT-Creation-Date: 2014-11-12 00:52+0100\n"
+"POT-Creation-Date: 2015-02-20 20:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,30 +59,30 @@ msgid "OPTIONS"
msgstr ""
#. type: SH
-#: en/fatlabel.8:41 en/fsck.fat.8:128 en/mkfs.fat.8:78
+#: en/fatlabel.8:41 en/fsck.fat.8:125 en/mkfs.fat.8:78
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/fatlabel.8:45 en/fsck.fat.8:132
+#: en/fatlabel.8:45 en/fsck.fat.8:129
msgid "B<mkfs.fat>(8)"
msgstr ""
#. type: SH
-#: en/fatlabel.8:46 en/fsck.fat.8:133 en/mkfs.fat.8:83
+#: en/fatlabel.8:46 en/fsck.fat.8:130 en/mkfs.fat.8:83
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: SH
-#: en/fatlabel.8:49 en/fsck.fat.8:136 en/mkfs.fat.8:86
+#: en/fatlabel.8:49 en/fsck.fat.8:133 en/mkfs.fat.8:86
#, no-wrap
msgid "AUTHORS"
msgstr ""
#. type: Plain text
-#: en/fatlabel.8:50 en/fsck.fat.8:137 en/mkfs.fat.8:87
+#: en/fatlabel.8:50 en/fsck.fat.8:134 en/mkfs.fat.8:87
msgid ""
"B<dosfstools> were written by Werner Almesberger E<lt>I<werner."
"almesberger@lrc.di.epfl.ch>E<gt>, Roman Hodek E<lt>I<Roman.Hodek@informatik."
@@ -368,31 +368,32 @@ msgid "B<-r>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:98
+#: en/fsck.fat.8:97
msgid ""
"Interactively repair the filesystem. The user is asked for advice whenever "
-"there is more than one approach to fix an inconsistency."
+"there is more than one approach to fix an inconsistency. This is the default "
+"mode and the option is only retained for backwards compatibility."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:98
+#: en/fsck.fat.8:97
#, no-wrap
msgid "B<-t>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:100
+#: en/fsck.fat.8:99
msgid "Mark unreadable clusters as bad."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:100
+#: en/fsck.fat.8:99
#, no-wrap
msgid "B<-u>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:102
+#: en/fsck.fat.8:101
msgid ""
"Try to undelete the specified file. B<fsck.fat> tries to allocate a chain of "
"contiguous unallocated clusters beginning with the start cluster of the "
@@ -400,24 +401,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/fsck.fat.8:102 en/mkfs.fat.8:72
+#: en/fsck.fat.8:101 en/mkfs.fat.8:72
#, no-wrap
msgid "B<-v>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:104
+#: en/fsck.fat.8:103
msgid "Verbose mode. Generates slightly more output."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:104
+#: en/fsck.fat.8:103
#, no-wrap
msgid "B<-V>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:106
+#: en/fsck.fat.8:105
msgid ""
"Perform a verification pass. The filesystem check is repeated after the "
"first run. The second pass should never report any fixable errors. It may "
@@ -427,91 +428,84 @@ msgid ""
msgstr ""
#. type: IP
-#: en/fsck.fat.8:106
+#: en/fsck.fat.8:105
#, no-wrap
msgid "B<-w>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:108
+#: en/fsck.fat.8:107
msgid "Write changes to disk immediately."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:108
+#: en/fsck.fat.8:107
#, no-wrap
msgid "B<-y>"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:110
+#: en/fsck.fat.8:109
msgid ""
"Same as B<-a> (automatically repair filesystem) for compatibility with other "
"fsck tools."
msgstr ""
-#. type: Plain text
-#: en/fsck.fat.8:112
-msgid ""
-"B<Note:> If B<-a> and B<-r> are absent, the filesystem is only checked, but "
-"not repaired."
-msgstr ""
-
#. type: SH
-#: en/fsck.fat.8:113
+#: en/fsck.fat.8:110
#, no-wrap
msgid "EXIT STATUS"
msgstr ""
#. type: IP
-#: en/fsck.fat.8:114
+#: en/fsck.fat.8:111
#, no-wrap
msgid "0"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:116
+#: en/fsck.fat.8:113
msgid "No recoverable errors have been detected."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:116
+#: en/fsck.fat.8:113
#, no-wrap
msgid "1"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:118
+#: en/fsck.fat.8:115
msgid ""
"Recoverable errors have been detected or B<fsck.fat> has discovered an "
"internal inconsistency."
msgstr ""
#. type: IP
-#: en/fsck.fat.8:118
+#: en/fsck.fat.8:115
#, no-wrap
msgid "2"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:120
+#: en/fsck.fat.8:117
msgid "Usage error. B<fsck.fat> did not access the filesystem."
msgstr ""
#. type: SH
-#: en/fsck.fat.8:121
+#: en/fsck.fat.8:118
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/fsck.fat.8:122
+#: en/fsck.fat.8:119
#, no-wrap
msgid "fsck0000.rec, fsck0001.rec, ..."
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:124
+#: en/fsck.fat.8:121
msgid ""
"When recovering from a corrupted filesystem, B<fsck.fat> dumps recovered "
"data into files named 'fsckNNNN.rec' in the top level directory of the "
@@ -519,13 +513,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/fsck.fat.8:125 en/mkfs.fat.8:75
+#: en/fsck.fat.8:122 en/mkfs.fat.8:75
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:127
+#: en/fsck.fat.8:124
msgid ""
"Does not create . and .. files where necessary. Does not remove entirely "
"empty directories. Should give more diagnostic messages. Undeleting files "
@@ -533,12 +527,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:130 en/mkfs.fat.8:80
+#: en/fsck.fat.8:127 en/mkfs.fat.8:80
msgid "B<fatlabel>(8)"
msgstr ""
#. type: Plain text
-#: en/fsck.fat.8:135 en/mkfs.fat.8:85
+#: en/fsck.fat.8:132 en/mkfs.fat.8:85
msgid ""
"More information about B<fsck.fat> and B<dosfstools> can be found at "
"E<lt>I<http://daniel-baumann.ch/software/dosfstools/>E<gt>."
diff --git a/src/fsck.fat.c b/src/fsck.fat.c
index c073d9a..6c7fd87 100644
--- a/src/fsck.fat.c
+++ b/src/fsck.fat.c
@@ -108,8 +108,8 @@ int main(int argc, char **argv)
uint32_t free_clusters = 0;
memset(&fs, 0, sizeof(fs));
- rw = salvage_files = verify = 0;
- interactive = 1;
+ salvage_files = verify = 0;
+ rw = interactive = 1;
check_atari();
while ((c = getopt(argc, argv, "Aac:d:bflnprtu:vVwy")) != EOF)
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
}
set_dos_codepage(-1); /* set default codepage if none was given in command line */
if ((test || write_immed) && !rw) {
- fprintf(stderr, "-t and -w require -a or -r\n");
+ fprintf(stderr, "-t and -w can not be used in read only mode\n");
exit(2);
}
if (optind != argc - 1)
--
1.9.1
|
