summaryrefslogtreecommitdiff
path: root/e2fsprogs/tune2fs.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-09-24 05:55:03 +0000
committerMike Frysinger <vapier@gentoo.org>2005-09-24 05:55:03 +0000
commita1c6a57fea0aeb08cc23d68684252fc7e1508f59 (patch)
treec328fde6f401c5e16979ca68dbd17e76302e352f /e2fsprogs/tune2fs.c
parent9ac178ab408354bcf61ee19a071fdc1e4f163737 (diff)
downloadbusybox-w32-a1c6a57fea0aeb08cc23d68684252fc7e1508f59.tar.gz
busybox-w32-a1c6a57fea0aeb08cc23d68684252fc7e1508f59.tar.bz2
busybox-w32-a1c6a57fea0aeb08cc23d68684252fc7e1508f59.zip
make e2label and findfs optional
Diffstat (limited to 'e2fsprogs/tune2fs.c')
-rw-r--r--e2fsprogs/tune2fs.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index e4f904ea0..24c4db3c2 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -375,7 +375,7 @@ err:
375 exit(1); 375 exit(1);
376} 376}
377 377
378 378#ifdef CONFIG_E2LABEL
379static void parse_e2label_options(int argc, char ** argv) 379static void parse_e2label_options(int argc, char ** argv)
380{ 380{
381 if ((argc < 2) || (argc > 3)) 381 if ((argc < 2) || (argc > 3))
@@ -393,6 +393,7 @@ static void parse_e2label_options(int argc, char ** argv)
393 } else 393 } else
394 print_label++; 394 print_label++;
395} 395}
396#endif
396 397
397static time_t parse_time(char *str) 398static time_t parse_time(char *str)
398{ 399{
@@ -613,6 +614,7 @@ static void parse_tune2fs_options(int argc, char **argv)
613 bb_error_msg_and_die("Unable to resolve '%s'", argv[optind]); 614 bb_error_msg_and_die("Unable to resolve '%s'", argv[optind]);
614} 615}
615 616
617#ifdef CONFIG_FINDFS
616static void do_findfs(int argc, char **argv) 618static void do_findfs(int argc, char **argv)
617{ 619{
618 char *dev; 620 char *dev;
@@ -624,8 +626,9 @@ static void do_findfs(int argc, char **argv)
624 if (!dev) 626 if (!dev)
625 bb_error_msg_and_die("Unable to resolve '%s'", argv[1]); 627 bb_error_msg_and_die("Unable to resolve '%s'", argv[1]);
626 puts(dev); 628 puts(dev);
627 exit(0); 629 return 0;
628} 630}
631#endif
629 632
630int tune2fs_main(int argc, char **argv) 633int tune2fs_main(int argc, char **argv)
631{ 634{
@@ -633,13 +636,20 @@ int tune2fs_main(int argc, char **argv)
633 ext2_filsys fs; 636 ext2_filsys fs;
634 struct ext2_super_block *sb; 637 struct ext2_super_block *sb;
635 io_manager io_ptr; 638 io_manager io_ptr;
639#if defined(CONFIG_FINDFS) || defined(CONFIG_E2LABEL)
636 char *program_name = basename(argv[0]); 640 char *program_name = basename(argv[0]);
641#endif
637 642
643#ifdef CONFIG_FINDFS
638 if (strcmp(program_name, "findfs") == 0) 644 if (strcmp(program_name, "findfs") == 0)
639 do_findfs(argc, argv); 645 return do_findfs(argc, argv);
646#endif
647
648#ifdef CONFIG_E2LABEL
640 if (strcmp(program_name, "e2label") == 0) 649 if (strcmp(program_name, "e2label") == 0)
641 parse_e2label_options(argc, argv); 650 parse_e2label_options(argc, argv);
642 else 651 else
652#endif
643 parse_tune2fs_options(argc, argv); 653 parse_tune2fs_options(argc, argv);
644 654
645 io_ptr = unix_io_manager; 655 io_ptr = unix_io_manager;