aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunk@stsci.edu>2009-09-11 13:55:35 -0400
committerJoseph Hunkeler <jhunk@stsci.edu>2009-09-11 13:55:35 -0400
commitc9eb66a655d2c3f51ee0c07df5aa191d927fb56c (patch)
treeee90c4c80f28028feb769b9048ac1e118a531959
parentcb583ccdc4e363813826bb36aa1eb8502b787d33 (diff)
downloadNetNuke-c9eb66a655d2c3f51ee0c07df5aa191d927fb56c.tar.gz
Version information is displayed on the first line.
Added newline characters to various areas for a cleaner output.
-rw-r--r--netnuke.c15
-rw-r--r--netnuke.h1
2 files changed, 15 insertions, 1 deletions
diff --git a/netnuke.c b/netnuke.c
index 96dbf6e..a99bd32 100644
--- a/netnuke.c
+++ b/netnuke.c
@@ -288,7 +288,7 @@ void echoList()
} while( 1 );
- printf("%d device%c detected\n", mediaFound, mediaFound < 1 || mediaFound > 1 ? 's' : 0 );
+ printf("%d device%s detected\n", mediaFound, mediaFound < 1 || mediaFound > 1 ? "s" : " \b" );
putchar('\n');
}
@@ -354,6 +354,16 @@ void usage(const char* cmd)
putchar('\n');
}
+void version_short()
+{
+ printf("NetNuke v%d.%d-%s\nCopyright (C) 2009 %s <%s>\n\
+This software is licensed under %sv%d\n",
+ NETNUKE_VERSION_MAJOR, NETNUKE_VERSION_MINOR,
+ NETNUKE_VERSION_REVISION, NETNUKE_AUTHOR,
+ NETNUKE_AUTHOR_EMAIL, NETNUKE_LICENSE_TYPE,
+ NETNUKE_LICENSE_VERSION);
+}
+
void version(const char* cmd)
{
printf("NetNuke v%d.%d-%s\n \
@@ -497,6 +507,8 @@ int main(int argc, char* argv[])
int i = 0;
int mt = 0;
+ version_short();
+ putchar('\n');
if(udef_verbose)
{
char* nlstr = {0};
@@ -525,6 +537,7 @@ int main(int argc, char* argv[])
printf("Pass #: %u\n", udef_passes);
printf("Write mode: %cSYNC\n", udef_wmode ? 'A' : 0);
}
+ putchar('\n');
echoList();
do
diff --git a/netnuke.h b/netnuke.h
index 4328521..8be852a 100644
--- a/netnuke.h
+++ b/netnuke.h
@@ -8,6 +8,7 @@ int32_t nuke(char* media, uint64_t size);
uint64_t getSize(const char* media);
void echoList(void);
void usage(const char* cmd);
+void version_short();
void version(const char* cmd);
#ifndef __FreeBSD__
int humanize_number(char *buf, size_t len, int64_t bytes,