/* main.c
*
- * $Id: main.c,v 1.355 2004/01/18 00:40:39 ulfl Exp $
+ * $Id: main.c,v 1.356 2004/01/18 01:41:14 obiot Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
snprintf(message, MAX_ABOUT_MSG_LEN,
"Ethereal - Network Protocol Analyzer\n\n"
- "Version " VERSION CVSVERSION " (C) 1998-2003 Gerald Combs <gerald@ethereal.com>\n\n"
-
+ "Version " VERSION
+#ifdef CVSVERSION
+ " (cvs " CVSVERSION ")"
+#endif
+ " (C) 1998-2003 Gerald Combs <gerald@ethereal.com>\n\n"
+
"%s\n"
"%s\n\n"
print_usage(gboolean print_ver) {
if (print_ver) {
- fprintf(stderr, "This is GNU " PACKAGE " " VERSION CVSVERSION "\n%s\n%s\n",
- comp_info_str->str, runtime_info_str->str);
+ fprintf(stderr, "This is GNU " PACKAGE " " VERSION
+#ifdef CVSVERSION
+ " (cvs " CVSVERSION ")"
+#endif
+ "\n%s\n%s\n",
+ comp_info_str->str, runtime_info_str->str);
}
#ifdef HAVE_LIBPCAP
fprintf(stderr, "\n%s [ -vh ] [ -klLnpQS ] [ -a <capture autostop condition> ] ...\n",
create_console();
#endif
- printf("%s %s%s\n%s\n%s\n", PACKAGE, VERSION, CVSVERSION, comp_info_str->str,
- runtime_info_str->str);
+ printf(PACKAGE " " VERSION
+#ifdef CVSVERSION
+ " (cvs " CVSVERSION ")"
+#endif
+ "\n%s\n%s\n",
+ comp_info_str->str, runtime_info_str->str);
}
static int
#
# Copyright 2004 Jörg Mayer (see AUTHORS file)
#
-# $Id: make-version.pl,v 1.2 2004/01/17 13:09:00 jmayer Exp $
+# $Id: make-version.pl,v 1.3 2004/01/18 01:41:13 obiot Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
$last = `cat cvsversion`;
}
if ( $last ne "" ) {
- $last = "#define CVSVERSION \"cvs$last\"\n";
+ $last = "#define CVSVERSION \"$last\"\n";
} else {
- $last = "#define CVSVERSION \"\"\n";
+ $last = "/* #define CVSVERSION \"\" */\n";
}
my $needsupdate=0;
/* Combine two dump files, either by appending or by merging by timestamp
*
- * $Id: mergecap.c,v 1.12 2004/01/16 20:03:10 jmayer Exp $
+ * $Id: mergecap.c,v 1.13 2004/01/18 01:41:14 obiot Exp $
*
* Written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
break;
case 'h':
- fprintf(stderr, "mergecap version %s%s\n", VERSION, CVSVERSION);
+ fprintf(stderr, "mergecap version %s"
+#ifdef CVSVERSION
+ " (cvs " CVSVERSION ")"
+#endif
+ "\n", VERSION);
usage();
exit(1);
break;
/* tethereal.c
*
- * $Id: tethereal.c,v 1.218 2004/01/16 20:03:10 jmayer Exp $
+ * $Id: tethereal.c,v 1.219 2004/01/18 01:41:13 obiot Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
int i;
if (print_ver) {
- fprintf(stderr, "This is GNU t%s %s%s\n%s\n%s\n", PACKAGE, VERSION, CVSVERSION,
+ fprintf(stderr, "This is GNU t" PACKAGE " " VERSION
+#ifdef CVSVERSION
+ " (cvs " CVSVERSION ")"
+#endif
+ "\n%s\n%s\n",
comp_info_str->str, runtime_info_str->str);
}
#ifdef HAVE_LIBPCAP
}
break;
case 'v': /* Show version and exit */
- printf("t%s %s%s\n%s\n%s\n", PACKAGE, VERSION, CVSVERSION, comp_info_str->str,
- runtime_info_str->str);
+ printf("t" PACKAGE " " VERSION
+#ifdef CVSVERSION
+ " (cvs " CVSVERSION ")"
+#endif
+ "\n%s\n%s\n",
+ comp_info_str->str, runtime_info_str->str);
exit(0);
break;
case 'w': /* Write to capture file xxx */