X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fipcalc.c;h=18abc12eb405a07d8ae6aae342cab8d62a99d5fb;hb=d7171c114028815df4e92f9c26875f1d60c6af2a;hp=32b939f9611ef76e5c38daa85235d96a8e33b566;hpb=bdc88fdc6844ee6890e31ba4cf56800becc8c682;p=oweals%2Fbusybox.git

diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 32b939f96..18abc12eb 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -12,7 +12,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <getopt.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
@@ -36,7 +35,7 @@ static unsigned long get_netmask(unsigned long ipaddr)
 		return 0;
 }
 
-#ifdef CONFIG_FEATURE_IPCALC_FANCY
+#if ENABLE_FEATURE_IPCALC_FANCY
 static int get_prefix(unsigned long netmask)
 {
 	unsigned long msk = 0x80000000;
@@ -63,7 +62,7 @@ int get_prefix(unsigned long netmask);
 #define SILENT    0x20
 
 #if ENABLE_FEATURE_IPCALC_LONG_OPTIONS
-	static const char ipcalc_longopts[] =
+	static const char ipcalc_longopts[] ALIGN1 =
 		"netmask\0"   No_argument "m"
 		"broadcast\0" No_argument "b"
 		"network\0"   No_argument "n"
@@ -72,10 +71,10 @@ int get_prefix(unsigned long netmask);
 		"hostname\0"  No_argument "h"
 		"silent\0"    No_argument "s"
 # endif
-		"\0";
+		;
 #endif
 
-int ipcalc_main(int argc, char **argv);
+int ipcalc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ipcalc_main(int argc, char **argv)
 {
 	unsigned opt;
@@ -87,7 +86,7 @@ int ipcalc_main(int argc, char **argv)
 #if ENABLE_FEATURE_IPCALC_LONG_OPTIONS
 	applet_long_options = ipcalc_longopts;
 #endif
-	opt = getopt32(argc, argv, "mbn" USE_FEATURE_IPCALC_FANCY("phs"));
+	opt = getopt32(argv, "mbn" IF_FEATURE_IPCALC_FANCY("phs"));
 	argc -= optind;
 	argv += optind;
 	if (opt & (BROADCAST | NETWORK | NETPREFIX)) {
@@ -176,15 +175,12 @@ int ipcalc_main(int argc, char **argv)
 
 		if (opt & HOSTNAME) {
 			struct hostent *hostinfo;
-			int x;
 
 			hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET);
 			if (!hostinfo) {
-				bb_herror_msg_and_die("cannot find hostname for %s", argv[0]);
-			}
-			for (x = 0; hostinfo->h_name[x]; x++) {
-				hostinfo->h_name[x] = tolower(hostinfo->h_name[x]);
+				bb_herror_msg_and_die("can't find hostname for %s", argv[0]);
 			}
+			str_tolower(hostinfo->h_name);
 
 			printf("HOSTNAME=%s\n", hostinfo->h_name);
 		}