Blame net-tools-1.60-hostname-short.patch
|
 |
74d61f0 |
diff -up net-tools-1.60/hostname.c.hostname-short net-tools-1.60/hostname.c
|
|
|
74d61f0 |
--- net-tools-1.60/hostname.c.hostname-short 2009-09-30 17:44:21.000000000 +0200
|
|
|
74d61f0 |
+++ net-tools-1.60/hostname.c 2009-09-08 11:55:03.000000000 +0200
|
|
|
74d61f0 |
@@ -176,11 +176,6 @@ static void showhname(char *hname, int c
|
|
|
74d61f0 |
case 'f':
|
|
|
74d61f0 |
printf("%s\n", hp->h_name);
|
|
|
74d61f0 |
break;
|
|
|
74d61f0 |
- case 's':
|
|
|
74d61f0 |
- if (p != NULL)
|
|
|
74d61f0 |
- *p = '\0';
|
|
|
74d61f0 |
- printf("%s\n", hp->h_name);
|
|
|
74d61f0 |
- break;
|
|
|
74d61f0 |
default:
|
|
|
74d61f0 |
;
|
|
|
74d61f0 |
}
|
|
|
74d61f0 |
@@ -270,6 +265,7 @@ int main(int argc, char **argv)
|
|
|
74d61f0 |
char myname[MAXHOSTNAMELEN + 1] =
|
|
|
74d61f0 |
{0};
|
|
|
74d61f0 |
char *file = NULL;
|
|
|
74d61f0 |
+ char *p;
|
|
|
74d61f0 |
|
|
|
74d61f0 |
static const struct option long_options[] =
|
|
|
74d61f0 |
{
|
|
|
74d61f0 |
@@ -370,7 +366,13 @@ int main(int argc, char **argv)
|
|
|
74d61f0 |
if (!type)
|
|
|
74d61f0 |
printf("%s\n", myname);
|
|
|
74d61f0 |
else
|
|
|
74d61f0 |
- showhname(myname, type);
|
|
|
74d61f0 |
+ if (type == 's') {
|
|
|
74d61f0 |
+ if (p = strchr(myname, '.'))
|
|
|
74d61f0 |
+ *p = '\0';
|
|
|
74d61f0 |
+ printf("%s\n", myname);
|
|
|
74d61f0 |
+ }
|
|
|
74d61f0 |
+ else
|
|
|
74d61f0 |
+ showhname(myname, type);
|
|
|
74d61f0 |
break;
|
|
|
74d61f0 |
case 3:
|
|
|
74d61f0 |
if (file) {
|