X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fexfatprogs.git;a=blobdiff_plain;f=fsck%2Frepair.c;h=92b1c3f90799868297bc3290f3a4e00d5c109b46;hp=c79d37977f00cb11af642b49d4e7f1310eeefa14;hb=03290761e3849db9b13d2d3b176b36ab31c395bb;hpb=dcb4e80c267579d1a68e3f34f6b750e2940dbcc2

diff --git a/fsck/repair.c b/fsck/repair.c
index c79d379..92b1c3f 100644
--- a/fsck/repair.c
+++ b/fsck/repair.c
@@ -5,16 +5,22 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 #include "exfat_ondisk.h"
 #include "libexfat.h"
-#include "fsck.h"
 #include "repair.h"
+#include "exfat_fs.h"
+#include "exfat_dir.h"
+#include "fsck.h"
 
 struct exfat_repair_problem {
 	er_problem_code_t	prcode;
 	unsigned int		flags;
 	unsigned int		prompt_type;
+	unsigned int		default_number;
+	unsigned int		bypass_number;
+	unsigned int		max_number;
 };
 
 /* Problem flags */
@@ -25,24 +31,36 @@ struct exfat_repair_problem {
 /* Prompt types */
 #define ERP_FIX			0x00000001
 #define ERP_TRUNCATE		0x00000002
+#define ERP_DELETE		0x00000003
+#define ERP_RENAME		0x00000004
 
 static const char *prompts[] = {
 	"Repair",
 	"Fix",
 	"Truncate",
+	"Delete",
+	"Select",
 };
 
 static struct exfat_repair_problem problems[] = {
-	{ER_BS_CHECKSUM, ERF_PREEN_YES, ERP_FIX},
-	{ER_BS_BOOT_REGION, 0, ERP_FIX},
-	{ER_DE_CHECKSUM, ERF_PREEN_YES, ERP_FIX},
-	{ER_FILE_VALID_SIZE, ERF_PREEN_YES, ERP_FIX},
-	{ER_FILE_INVALID_CLUS, ERF_DEFAULT_NO, ERP_TRUNCATE},
-	{ER_FILE_FIRST_CLUS, ERF_DEFAULT_NO, ERP_TRUNCATE},
-	{ER_FILE_SMALLER_SIZE, ERF_DEFAULT_NO, ERP_TRUNCATE},
-	{ER_FILE_LARGER_SIZE, ERF_DEFAULT_NO, ERP_TRUNCATE},
-	{ER_FILE_DUPLICATED_CLUS, ERF_DEFAULT_NO, ERP_TRUNCATE},
-	{ER_FILE_ZERO_NOFAT, ERF_PREEN_YES, ERP_FIX},
+	{ER_BS_CHECKSUM, ERF_PREEN_YES, ERP_FIX, 0, 0, 0},
+	{ER_BS_BOOT_REGION, 0, ERP_FIX, 0, 0, 0},
+	{ER_DE_CHECKSUM, ERF_PREEN_YES, ERP_DELETE, 0, 0, 0},
+	{ER_DE_UNKNOWN, ERF_PREEN_YES, ERP_DELETE, 0, 0, 0},
+	{ER_DE_FILE, ERF_PREEN_YES, ERP_DELETE, 0, 0, 0},
+	{ER_DE_SECONDARY_COUNT, ERF_PREEN_YES, ERP_DELETE, 0, 0, 0},
+	{ER_DE_STREAM, ERF_PREEN_YES, ERP_DELETE, 0, 0, 0},
+	{ER_DE_NAME, ERF_PREEN_YES, ERP_DELETE, 0, 0, 0},
+	{ER_DE_NAME_HASH, ERF_PREEN_YES, ERP_FIX, 0, 0, 0},
+	{ER_DE_NAME_LEN, ERF_PREEN_YES, ERP_FIX, 0, 0, 0},
+	{ER_DE_DOT_NAME, ERF_PREEN_YES, ERP_RENAME, 2, 3, 4},
+	{ER_FILE_VALID_SIZE, ERF_PREEN_YES, ERP_FIX, 0, 0, 0},
+	{ER_FILE_INVALID_CLUS, ERF_PREEN_YES, ERP_TRUNCATE, 0, 0, 0},
+	{ER_FILE_FIRST_CLUS, ERF_PREEN_YES, ERP_TRUNCATE, 0, 0, 0},
+	{ER_FILE_SMALLER_SIZE, ERF_PREEN_YES, ERP_TRUNCATE, 0, 0, 0},
+	{ER_FILE_LARGER_SIZE, ERF_PREEN_YES, ERP_TRUNCATE, 0, 0, 0},
+	{ER_FILE_DUPLICATED_CLUS, ERF_PREEN_YES, ERP_TRUNCATE, 0, 0, 0},
+	{ER_FILE_ZERO_NOFAT, ERF_PREEN_YES, ERP_FIX, 0, 0, 0},
 };
 
 static struct exfat_repair_problem *find_problem(er_problem_code_t prcode)
@@ -57,63 +75,85 @@ static struct exfat_repair_problem *find_problem(er_problem_code_t prcode)
 	return NULL;
 }
 
-static bool ask_repair(struct exfat *exfat, struct exfat_repair_problem *pr)
+static int ask_repair(struct exfat_fsck *fsck, struct exfat_repair_problem *pr)
 {
-	bool repair = false;
+	int repair = 0;
 	char answer[8];
 
-	if (exfat->options & FSCK_OPTS_REPAIR_NO ||
-			pr->flags & ERF_DEFAULT_NO)
-		repair = false;
-	else if (exfat->options & FSCK_OPTS_REPAIR_YES ||
-			pr->flags & ERF_DEFAULT_YES)
-		repair = true;
+	if (fsck->options & FSCK_OPTS_REPAIR_NO ||
+	    pr->flags & ERF_DEFAULT_NO)
+		repair = 0;
+	else if (fsck->options & FSCK_OPTS_REPAIR_YES ||
+		 pr->flags & ERF_DEFAULT_YES)
+		repair = 1;
 	else {
-		if (exfat->options & FSCK_OPTS_REPAIR_ASK) {
+		if (fsck->options & FSCK_OPTS_REPAIR_ASK) {
 			do {
-				printf(". %s (y/N)? ",
-					prompts[pr->prompt_type]);
+				if (pr->prompt_type & ERP_RENAME) {
+					printf("%s (Number: ?) ",
+					       prompts[pr->prompt_type]);
+				} else {
+					printf(". %s (y/N)? ",
+					       prompts[pr->prompt_type]);
+				}
 				fflush(stdout);
 
-				if (fgets(answer, sizeof(answer), stdin)) {
+				if (!fgets(answer, sizeof(answer), stdin))
+					continue;
+
+				if (pr->prompt_type & ERP_RENAME) {
+					unsigned int number = atoi(answer);
+
+					if (number > 0 && number < pr->max_number)
+						return number;
+				} else {
 					if (strcasecmp(answer, "Y\n") == 0)
-						return true;
-					else if (strcasecmp(answer, "\n") == 0
-						|| strcasecmp(answer, "N\n") == 0)
-						return false;
+						return 1;
+					else if (strcasecmp(answer, "\n") == 0 ||
+						 strcasecmp(answer, "N\n") == 0)
+						return 0;
 				}
 			} while (1);
-		} else if (exfat->options & FSCK_OPTS_REPAIR_AUTO &&
-				pr->flags & ERF_PREEN_YES)
-			repair = true;
+		} else if (fsck->options & FSCK_OPTS_REPAIR_AUTO &&
+			   pr->flags & ERF_PREEN_YES)
+			repair = 1;
 	}
 
-	printf(". %s (y/N)? %c\n", prompts[pr->prompt_type],
-		repair ? 'y' : 'n');
+	if (pr->prompt_type & ERP_RENAME) {
+		int print_num = repair ? pr->default_number : pr->bypass_number;
+
+		printf("%s (Number : %d)\n", prompts[pr->prompt_type],
+		       print_num);
+		repair = print_num;
+	} else {
+		printf(". %s (y/N)? %c\n", prompts[pr->prompt_type],
+		       repair ? 'y' : 'n');
+	}
 	return repair;
 }
 
-bool exfat_repair_ask(struct exfat *exfat, er_problem_code_t prcode,
-			const char *desc, ...)
+int exfat_repair_ask(struct exfat_fsck *fsck, er_problem_code_t prcode,
+		     const char *desc, ...)
 {
 	struct exfat_repair_problem *pr = NULL;
 	va_list ap;
+	int repair;
 
 	pr = find_problem(prcode);
 	if (!pr) {
 		exfat_err("unknown problem code. %#x\n", prcode);
-		return false;
+		return 0;
 	}
 
 	va_start(ap, desc);
 	vprintf(desc, ap);
 	va_end(ap);
 
-	if (ask_repair(exfat, pr)) {
+	repair = ask_repair(fsck, pr);
+	if (repair) {
 		if (pr->prompt_type & ERP_TRUNCATE)
-			exfat->dirty_fat = true;
-		exfat->dirty = true;
-		return true;
-	} else
-		return false;
+			fsck->dirty_fat = true;
+		fsck->dirty = true;
+	}
+	return repair;
 }