Always return an error in case of incorrect backup mode

Michael Paquier · Michael Paquier · commit 83f4e80a74d4 · 2013-12-16T00:50:36.000+09:00
Some code paths allowed an invalid backup mode to be passed, something
rather crazy as they directly depended on that...
diff --git a/catalog.c b/catalog.c
@@ -492,7 +492,7 @@ catalog_read_ini(const char *path)
 
 	if (backup_mode)
 	{
-		backup->backup_mode = parse_backup_mode(backup_mode, WARNING);
+		backup->backup_mode = parse_backup_mode(backup_mode);
 		free(backup_mode);
 	}
 
@@ -545,12 +545,14 @@ catalog_read_ini(const char *path)
 }
 
 BackupMode
-parse_backup_mode(const char *value, int elevel)
+parse_backup_mode(const char *value)
 {
 	const char *v = value;
 	size_t		len;
 
-	while (IsSpace(*v)) { v++; }
+	/* Skip all spaces detected */
+	while (IsSpace(*v))
+		v++;
 	len = strlen(v);
 
 	if (len > 0 && pg_strncasecmp("full", v, len) == 0)
@@ -560,7 +562,8 @@ parse_backup_mode(const char *value, int elevel)
 	else if (len > 0 && pg_strncasecmp("archive", v, len) == 0)
 		return BACKUP_MODE_ARCHIVE;
 
-	elog(elevel, _("invalid backup-mode \"%s\""), value);
+	/* Backup mode is invalid, so leave with an error */
+	elog(ERROR_ARGS, _("invalid backup-mode \"%s\""), value);
 	return BACKUP_MODE_INVALID;
 }
 
diff --git a/pg_rman.c b/pg_rman.c
@@ -330,5 +330,5 @@ if(!IsValidTime(tm)){
 static void
 opt_backup_mode(pgut_option *opt, const char *arg)
 {
-	current.backup_mode = parse_backup_mode(arg, ERROR_ARGS);
+	current.backup_mode = parse_backup_mode(arg);
 }
diff --git a/pg_rman.h b/pg_rman.h
@@ -230,7 +230,7 @@ extern const char *pgdata_exclude[];
 
 /* in backup.c */
 extern int do_backup(pgBackupOption bkupopt);
-extern BackupMode parse_backup_mode(const char *value, int elevel);
+extern BackupMode parse_backup_mode(const char *value);
 extern void check_server_version(void);
 extern bool fileExists(const char *path);
 

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@ catalog_read_ini(const char *path)`
`492`	`492`
`493`	`493`	`if (backup_mode)`
`494`	`494`	`{`
`495`		`- backup->backup_mode = parse_backup_mode(backup_mode, WARNING);`
	`495`	`+ backup->backup_mode = parse_backup_mode(backup_mode);`
`496`	`496`	`free(backup_mode);`
`497`	`497`	`}`
`498`	`498`
`@@ -545,12 +545,14 @@ catalog_read_ini(const char *path)`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`BackupMode`
`548`		`-parse_backup_mode(const char *value, int elevel)`
	`548`	`+parse_backup_mode(const char *value)`
`549`	`549`	`{`
`550`	`550`	`const char *v = value;`
`551`	`551`	`size_t len;`
`552`	`552`
`553`		`- while (IsSpace(*v)) { v++; }`
	`553`	`+ /* Skip all spaces detected */`
	`554`	`+ while (IsSpace(*v))`
	`555`	`+ v++;`
`554`	`556`	`len = strlen(v);`
`555`	`557`
`556`	`558`	`if (len > 0 && pg_strncasecmp("full", v, len) == 0)`
`@@ -560,7 +562,8 @@ parse_backup_mode(const char *value, int elevel)`
`560`	`562`	`else if (len > 0 && pg_strncasecmp("archive", v, len) == 0)`
`561`	`563`	`return BACKUP_MODE_ARCHIVE;`
`562`	`564`
`563`		`- elog(elevel, _("invalid backup-mode \"%s\""), value);`
	`565`	`+ /* Backup mode is invalid, so leave with an error */`
	`566`	`+ elog(ERROR_ARGS, _("invalid backup-mode \"%s\""), value);`
`564`	`567`	`return BACKUP_MODE_INVALID;`
`565`	`568`	`}`
`566`	`569`
Original file line number	Diff line number	Diff line change
`@@ -330,5 +330,5 @@ if(!IsValidTime(tm)){`
`330`	`330`	`static void`
`331`	`331`	`opt_backup_mode(pgut_option opt, const char arg)`
`332`	`332`	`{`
`333`		`- current.backup_mode = parse_backup_mode(arg, ERROR_ARGS);`
	`333`	`+ current.backup_mode = parse_backup_mode(arg);`
`334`	`334`	`}`