[Ocfs2-tools-devel] [PATCH 2/2] fsck.ocfs2: Print version
Sunil Mushran
sunil.mushran at oracle.com
Thu Jul 23 17:03:23 PDT 2009
Patch to fix version print.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
---
fsck.ocfs2/Makefile | 2 ++
fsck.ocfs2/fsck.c | 29 ++++++++++-------------------
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile
index 7f6e547..1ae64e8 100644
--- a/fsck.ocfs2/Makefile
+++ b/fsck.ocfs2/Makefile
@@ -5,6 +5,8 @@ include $(TOPDIR)/Preamble.make
sbindir = $(root_sbindir)
SBIN_PROGRAMS = fsck.ocfs2
+DEFINES += -DVERSION=\"$(VERSION)\"
+
INCLUDES = -I$(TOPDIR)/include -Iinclude
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
diff --git a/fsck.ocfs2/fsck.c b/fsck.ocfs2/fsck.c
index 3931756..8991200 100644
--- a/fsck.ocfs2/fsck.c
+++ b/fsck.ocfs2/fsck.c
@@ -53,6 +53,7 @@
#include <string.h>
#include <inttypes.h>
#include <signal.h>
+#include <libgen.h>
#include "ocfs2/ocfs2.h"
@@ -402,25 +403,9 @@ static void mark_magical_clusters(o2fsck_state *ost)
o2fsck_mark_clusters_allocated(ost, 0, cluster);
}
-static void version(void)
+static void print_version(char *progname)
{
- char url[] = "$URL$";
- char rev[] = "$Rev$";
- char noise[] = "fsck.ocfs2/fsck.c";
- char *found;
-
- /* url =~ s/noise// :P */
- found = strstr(url, noise);
- if (found) {
- char *rest = found + strlen(noise);
- memcpy(found, rest, sizeof(url) - (found - url));
- }
-
- printf("fsck.ocfs2 version information from Subversion:\n"
- " %s\n"
- " %s\n", url, rev);
-
- exit(FSCK_USAGE);
+ fprintf(stderr, "%s %s\n", progname, VERSION);
}
static errcode_t open_and_check(o2fsck_state *ost, char *filename,
@@ -652,6 +637,7 @@ int main(int argc, char **argv)
int fsck_mask = FSCK_OK;
int slot_recover_err = 0;
errcode_t ret;
+ char *progname;
memset(ost, 0, sizeof(o2fsck_state));
ost->ost_ask = 1;
@@ -668,6 +654,8 @@ int main(int argc, char **argv)
setlinebuf(stderr);
setlinebuf(stdout);
+ progname = basename(argv[0]);
+
while((c = getopt(argc, argv, "b:B:fFGnuvVyr:")) != EOF) {
switch (c) {
case 'b':
@@ -727,7 +715,8 @@ int main(int argc, char **argv)
break;
case 'V':
- version();
+ print_version(progname);
+ exit(FSCK_USAGE);
break;
case 'r':
@@ -758,6 +747,8 @@ int main(int argc, char **argv)
filename = argv[optind];
+ print_version(progname);
+
if (ost->ost_skip_o2cb) {
fprintf(stdout, "DANGER: YOU HAVE DISABLED THE CLUSTER CHECK. "
"CONTINUE ONLY IF YOU ARE ABSOLUTELY\nSURE THAT NO "
--
1.6.0.4
More information about the Ocfs2-tools-devel
mailing list