From 832381536ee28ea493b73785f7c0cfdd403a8269 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 9 Jan 2001 00:16:26 +0000
Subject: [PATCH] ChangeLog, Makefile.in, tune2fs.c:   Makefile.in, tune2fs.c:
 Move e2label functionality into tune2fs, using   	argv[0] as a dispatch.
  This allows e2label to be (more) safely used   	on mounted
 filesystems.

---
 misc/ChangeLog   |  6 +++++
 misc/Makefile.in |  8 +++---
 misc/tune2fs.c   | 78 +++++++++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 72 insertions(+), 20 deletions(-)

diff --git a/misc/ChangeLog b/misc/ChangeLog
index f9991f0..f352293 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-08    <tytso@snap.thunk.org>
+
+	* Makefile.in, tune2fs.c: Move e2label functionality into tune2fs,
+		using argv[0] as a dispatch.  This allows e2label to be
+		(more) safely used on mounted filesystems.
+
 2001-01-05    <tytso@snap.thunk.org>
 
 	* get_device_by_label.h (get_volume_label_by_spec): Add function
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 10832dc..bc76132 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -11,7 +11,7 @@ INSTALL = @INSTALL@
 
 @MCONFIG@
 
-SPROGS=		mke2fs badblocks tune2fs dumpe2fs e2label e2image @FSCK_PROG@
+SPROGS=		mke2fs badblocks tune2fs dumpe2fs e2image @FSCK_PROG@
 USPROGS=	mklost+found
 SMANPAGES=	tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
 			e2label.8 @FSCK_MAN@
@@ -27,7 +27,6 @@ LSATTR_OBJS=	lsattr.o
 UUIDGEN_OBJS=	uuidgen.o
 DUMPE2FS_OBJS=	dumpe2fs.o
 BADBLOCKS_OBJS=	badblocks.o
-E2LABEL_OBJS=	e2label.o
 E2IMAGE_OBJS=	e2image.o
 FSCK_OBJS=	fsck.o get_device_by_label.o base_device.o
 
@@ -56,9 +55,6 @@ findsuper: findsuper.o
 tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS_E2P) $(DEPLIBUUID)
 	$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS_E2P) $(LIBUUID)
 
-e2label: $(E2LABEL_OBJS) 
-	$(CC) $(ALL_LDFLAGS) -o e2label $(E2LABEL_OBJS) 
-
 e2image: $(E2IMAGE_OBJS) $(DEPLIBS)
 	$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS)
 
@@ -146,6 +142,8 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
 	done
 	$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
 		$(DESTDIR)$(root_sbindir)/mkfs.ext2
+	$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+		$(DESTDIR)$(root_sbindir)/e2label
 	for i in $(UPROGS); do \
 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
 		$(STRIP) $(DESTDIR)$(bindir)/$$i; \
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index adbc1a9..cf2163a 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -58,10 +58,13 @@ char * device_name;
 char * new_label, *new_last_mounted, *new_UUID, *journal_opts;
 static int c_flag, C_flag, e_flag, g_flag, i_flag, l_flag, L_flag;
 static int m_flag, M_flag, r_flag, s_flag = -1, u_flag, U_flag;
+static int print_label;
 static int max_mount_count, mount_count, mount_flags;
 static unsigned long interval, reserved_ratio, reserved_blocks;
 static unsigned long resgid, resuid;
 static unsigned short errors;
+static int open_flag;
+static char *features_cmd;
 
 int journal_size, journal_flags;
 char *journal_device;
@@ -235,31 +238,47 @@ static void add_journal(ext2_filsys fs)
 	}
 }
 
+/*
+ * Given argv[0], return the program name.
+ */
+char *get_progname(char *argv_zero)
+{
+	char	*cp;
 
+	cp = strrchr(argv_zero, '/');
+	if (!cp )
+		return argv_zero;
+	else
+		return cp+1;
+}
 
-int main (int argc, char ** argv)
+
+void parse_e2label_options(int argc, char ** argv)
+{
+	if ((argc < 2) || (argc > 3)) {
+		fprintf(stderr, _("Usage: e2label device [newlabel]\n"));
+		exit(1);
+	}
+	device_name = argv[1];
+	if (argc == 3) {
+		open_flag = EXT2_FLAG_RW;
+		L_flag = 1;
+		new_label = argv[2];
+	} else 
+		print_label++;
+}
+
+
+void parse_tune2fs_options(int argc, char **argv)
 {
 	int c;
 	char * tmp;
-	errcode_t retval;
-	ext2_filsys fs;
-	struct ext2_super_block *sb;
 	struct group * gr;
 	struct passwd * pw;
-	int open_flag = 0;
-	char *features_cmd = 0;
 
-#ifdef ENABLE_NLS
-	setlocale(LC_MESSAGES, "");
-	bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
-	textdomain(NLS_CAT_NAME);
-#endif
 	fprintf (stderr, _("tune2fs %s, %s for EXT2 FS %s, %s\n"),
 		 E2FSPROGS_VERSION, E2FSPROGS_DATE,
 		 EXT2FS_VERSION, EXT2FS_DATE);
-	if (argc && *argv)
-		program_name = *argv;
-	initialize_ext2_error_table();
 	while ((c = getopt (argc, argv, "c:e:g:i:j:lm:r:s:u:C:L:M:O:U:")) != EOF)
 		switch (c)
 		{
@@ -433,6 +452,30 @@ int main (int argc, char ** argv)
 	if (!open_flag && !l_flag)
 		usage();
 	device_name = argv[optind];
+}	
+
+
+
+int main (int argc, char ** argv)
+{
+	errcode_t retval;
+	ext2_filsys fs;
+	struct ext2_super_block *sb;
+
+#ifdef ENABLE_NLS
+	setlocale(LC_MESSAGES, "");
+	bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
+	textdomain(NLS_CAT_NAME);
+#endif
+	if (argc && *argv)
+		program_name = *argv;
+	initialize_ext2_error_table();
+
+	if (strcmp(get_progname(argv[0]), "e2label") == 0)
+		parse_e2label_options(argc, argv);
+	else
+		parse_tune2fs_options(argc, argv);
+	
 	retval = ext2fs_open (device_name, open_flag, 0, 0,
 			      unix_io_manager, &fs);
         if (retval) {
@@ -441,6 +484,12 @@ int main (int argc, char ** argv)
 		printf(_("Couldn't find valid filesystem superblock.\n"));
 		exit(1);
 	}
+	sb = fs->super;
+	if (print_label) {
+		/* For e2label emulation */
+		printf("%.*s\n", sizeof(sb->s_volume_name), sb->s_volume_name);
+		exit(0);
+	}
 	retval = ext2fs_check_if_mounted(device_name, &mount_flags);
 	if (retval) {
 		com_err("ext2fs_check_if_mount", retval,
@@ -448,7 +497,6 @@ int main (int argc, char ** argv)
 			device_name);
 		return;
 	}
-	sb = fs->super;
 	/* Normally we only need to write out the superblock */
 	fs->flags |= EXT2_FLAG_SUPER_ONLY;
 
-- 
1.8.3.1