projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warning
[oweals/busybox.git]
/
hostname.c
diff --git
a/hostname.c
b/hostname.c
index 3dba641540e2c8da76c6fedfae5e189a7ed7a9a6..a6e001d54459dcfb502d680c25c3818a35b1d1f8 100644
(file)
--- a/
hostname.c
+++ b/
hostname.c
@@
-1,6
+1,6
@@
/* vi: set sw=4 ts=4: */
/*
/* vi: set sw=4 ts=4: */
/*
- * $Id: hostname.c,v 1.2
2 2001/01/31 19:00:20 kraai
Exp $
+ * $Id: hostname.c,v 1.2
6 2001/03/09 21:24:12 andersen
Exp $
* Mini hostname implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
* Mini hostname implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@
-30,8
+30,9
@@
#include <unistd.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
-void do_sethostname(char *s, int isfile)
+
static
void do_sethostname(char *s, int isfile)
{
FILE *f;
char buf[255];
{
FILE *f;
char buf[255];
@@
-49,8
+50,7
@@
void do_sethostname(char *s, int isfile)
f = xfopen(s, "r");
fgets(buf, 255, f);
fclose(f);
f = xfopen(s, "r");
fgets(buf, 255, f);
fclose(f);
- if (buf[strlen(buf) - 1] == '\n')
- buf[strlen(buf) - 1] = 0;
+ chomp(buf);
if (sethostname(buf, strlen(buf)) < 0)
perror_msg_and_die("sethostname");
}
if (sethostname(buf, strlen(buf)) < 0)
perror_msg_and_die("sethostname");
}
@@
-67,7
+67,7
@@
int hostname_main(int argc, char **argv)
char *s = NULL;
if (argc < 1)
char *s = NULL;
if (argc < 1)
-
usage(hostname_usage
);
+
show_usage(
);
while (--argc > 0 && **(++argv) == '-') {
while (*(++(*argv))) {
while (--argc > 0 && **(++argv) == '-') {
while (*(++(*argv))) {
@@
-83,18
+83,18
@@
int hostname_main(int argc, char **argv)
break;
case 'F':
if (--argc == 0) {
break;
case 'F':
if (--argc == 0) {
-
usage(hostname_usage
);
+
show_usage(
);
}
filename = *(++argv);
break;
case '-':
if (strcmp(++(*argv), "file") || --argc ==0 ) {
}
filename = *(++argv);
break;
case '-':
if (strcmp(++(*argv), "file") || --argc ==0 ) {
-
usage(hostname_usage
);
+
show_usage(
);
}
filename = *(++argv);
break;
default:
}
filename = *(++argv);
break;
default:
-
usage(hostname_usage
);
+
show_usage(
);
}
if (filename != NULL)
break;
}
if (filename != NULL)
break;