[patch] Updated patch from RedHat to fix hostname -s

rh-bug-319981.patch (text/plain), 994 bytes, created by Joshua Kinard on 2014-06-30 09:28:45 UTC

diff -Naurp net-tools-1.60_p20130513023548.orig/hostname.c net-tools-1.60_p20130513023548/hostname.c
--- net-tools-1.60_p20130513023548.orig/hostname.c	2013-05-12 22:35:48.000000000 -0400
+++ net-tools-1.60_p20130513023548/hostname.c	2014-06-30 05:11:46.000000000 -0400
@@ -220,11 +220,6 @@ static void showhname(char *hname, int c
     case 'f':
 	printf("%s\n", hp->h_name);
 	break;
-    case 's':
-	if (p != NULL)
-	    *p = '\0';
-	printf("%s\n", hp->h_name);
-	break;
     }
 }
 
@@ -311,6 +306,7 @@ int main(int argc, char **argv)
     char myname[MAXHOSTNAMELEN + 1] =
     {0};
     char *file = NULL;
+    char *p;
 
     static const struct option long_options[] =
     {
@@ -412,7 +408,13 @@ int main(int argc, char **argv)
 	if (!type)
 	    printf("%s\n", myname);
 	else
-	    showhname(myname, type);
+		if (type == 's') {
+			if (p = strchr(myname, '.'))
+				*p = '\0';
+			printf("%s\n", myname);
+		}
+		else
+			showhname(myname, type);
 	break;
     case 3:
 	if (file) {