summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustus Winter <justus@gnupg.org>2016-10-03 18:45:51 +0200
committerJustus Winter <justus@gnupg.org>2016-10-03 19:27:18 +0200
commite6bffe8d286d49311c0d34acab4b9da867e0dfe8 (patch)
tree44c372f3294447d81f8cedad829abb2daa2b6241
parent63cfc3cdfd817d8f794c83bc39f86ab8b910fe71 (diff)
ext2fs: Disable option to specify alternate superblock.
* ext2fs/ext2fs.c (options): Disable '--sblock', this has never been implemented. (parse_opt): Likewise.
-rw-r--r--ext2fs/ext2fs.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/ext2fs/ext2fs.c b/ext2fs/ext2fs.c
index 03c9eedc..1ead6d2f 100644
--- a/ext2fs/ext2fs.c
+++ b/ext2fs/ext2fs.c
@@ -69,8 +69,11 @@ options[] =
" (not compiled in)"
#endif
},
+#ifdef ALTERNATE_SBLOCK
+ /* XXX This is not implemented. */
{"sblock", 'S', "BLOCKNO", 0,
"Use alternate superblock location (1kb blocks)"},
+#endif
{0}
};
@@ -83,7 +86,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
struct
{
int debug_flag;
+#ifdef ALTERNATE_SBLOCK
unsigned int sb_block;
+#endif
} *values = state->hook;
switch (key)
@@ -91,6 +96,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
case 'D':
values->debug_flag = 1;
break;
+#ifdef ALTERNATE_SBLOCK
case 'S':
values->sb_block = strtoul (arg, &arg, 0);
if (!arg || *arg != '\0')
@@ -99,6 +105,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
return EINVAL;
}
break;
+#endif
case ARGP_KEY_INIT:
state->child_inputs[0] = state->input;
@@ -107,7 +114,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
return ENOMEM;
state->hook = values;
memset (values, 0, sizeof *values);
+#ifdef ALTERNATE_SBLOCK
values->sb_block = SBLOCK_BLOCK;
+#endif
break;
case ARGP_KEY_SUCCESS: