From 9e5adde1bbbc4b3152a4dd145b3d35c41950d0f1 Mon Sep 17 00:00:00 2001
From: Babak Farrokhi <babak@farrokhi.net>
Date: Sat, 9 Apr 2016 11:37:42 +0430
Subject: [PATCH] rename dnsperf -> dnseval to avoid confusion with nominom's
 dnsperf

- rename dnsperf.py -> dnseval.py
- improve help text
---
 TODO.md                  | 5 +++--
 dnsperf.py => dnseval.py | 6 ++++--
 dnsping.py               | 8 +++++---
 dnstraceroute.py         | 3 ++-
 4 files changed, 14 insertions(+), 8 deletions(-)
 rename dnsperf.py => dnseval.py (96%)

diff --git a/TODO.md b/TODO.md
index 21cfbba..ede3436 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,6 @@
-# todo
+# TODO
+
 - input sanitization
 - implement basic DNS client functionality into dnstraceroute to eliminate need
   of modified dnspython module
-- add support for python 2.x for the conservatives and older people ;-)
+- add support for python 2.x for the conservatives and faint-hearted ;-)
diff --git a/dnsperf.py b/dnseval.py
similarity index 96%
rename from dnsperf.py
rename to dnseval.py
index 020ed5a..36a4bff 100755
--- a/dnsperf.py
+++ b/dnseval.py
@@ -26,6 +26,7 @@
 
 
 import getopt
+import os
 import signal
 import sys
 import time
@@ -35,6 +36,7 @@ import dns.rdatatype
 import dns.resolver
 
 __VERSION__ = 1.0
+__PROGNAME__ = os.path.basename(sys.argv[0])
 should_stop = False
 
 resolvers = [
@@ -50,8 +52,8 @@ resolvers = [
 
 
 def usage():
-    print('dnsperf version %1.1f\n' % __VERSION__)
-    print('syntax: dnsping [-h] [-f server-list] [-c count] [-t type] [-w wait] hostname')
+    print('%s version %1.1f\n' % (__PROGNAME__, __VERSION__))
+    print('syntax: %s [-h] [-f server-list] [-c count] [-t type] [-w wait] hostname' % __PROGNAME__ )
     print('  -h  --help      show this help')
     print('  -f  --file      dns server list to use')
     print('  -c  --count     number of requests to send (default: 10)')
diff --git a/dnsping.py b/dnsping.py
index 337e547..580faa2 100755
--- a/dnsping.py
+++ b/dnsping.py
@@ -26,6 +26,7 @@
 
 
 import getopt
+import os
 import signal
 import sys
 import time
@@ -35,12 +36,13 @@ import dns.rdatatype
 import dns.resolver
 
 __VERSION__ = 1.0
+__PROGNAME__ = os.path.basename(sys.argv[0])
 should_stop = False
 
 
 def usage():
-    print('dnsping version %1.1f\n' % __VERSION__)
-    print('syntax: dnsping [-h] [-q] [-v] [-s server] [-c count] [-t type] [-w wait] hostname')
+    print('%s version %1.1f\n' % (__PROGNAME__, __VERSION__))
+    print('syntax: %s [-h] [-q] [-v] [-s server] [-c count] [-t type] [-w wait] hostname' % __PROGNAME__)
     print('  -h  --help      show this help')
     print('  -q  --quiet     quiet')
     print('  -v  --verbose   print actual dns response')
@@ -115,7 +117,7 @@ def main():
     response_time = []
     i = 0
 
-    print("DNSPING %s: hostname=%s rdatatype=%s" % (dnsserver, hostname, dnsrecord))
+    print("%s %s: hostname=%s rdatatype=%s" % (__PROGNAME__, dnsserver, hostname, dnsrecord))
 
     for i in range(count):
         if should_stop:
diff --git a/dnstraceroute.py b/dnstraceroute.py
index 366dab0..d018a58 100755
--- a/dnstraceroute.py
+++ b/dnstraceroute.py
@@ -26,6 +26,7 @@
 
 
 import getopt
+import os
 import signal
 import socket
 import sys
@@ -35,7 +36,7 @@ import dns.rdatatype
 import dns.resolver
 
 __VERSION__ = 1.0
-__PROGNAME__ = sys.argv[0]
+__PROGNAME__ = os.path.basename(sys.argv[0])
 should_stop = False