mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-03 15:55:40 +00:00
Code Issues Releases Wiki Activity

now include sockio.h instead of ioctl.h if it exists

Browse Source 
"sudo -" now gets a better error message
This commit is contained in:
Todd C. Miller
1994-08-15 01:21:02 +00:00
parent 19c13f4fae
commit 98ca6de0d0
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sudo.c
View File

@@ -78,7 +78,11 @@ static char rcsid[] = "$Id$";
#include <netdb.h> #include <netdb.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifdef HAVE_SYS_SOCKIO_H
#include <sys/sockio.h>
#else
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif /* HAVE_SYS_SOCKIO_H */
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <net/if.h> #include <net/if.h>
@@ -334,7 +338,7 @@ static int parse_args()
if (Argc > 2) /* only one -? option allowed */ if (Argc > 2) /* only one -? option allowed */
usage(1); usage(1);
if (Argv[1][2] != '\0') { if (Argv[1][1] != '\0' && Argv[1][2] != '\0') {
fprintf(stderr, "%s: Please use single character options\n", Argv[0]); fprintf(stderr, "%s: Please use single character options\n", Argv[0]);
usage(1); usage(1);
} }
@@ -352,6 +356,9 @@ static int parse_args()
case 'h': case 'h':
ret = MODE_HELP; ret = MODE_HELP;
break; break;
case '\0':
fprintf(stderr, "%s: '-' requires an argument\n", Argv[0]);
usage(1);
default: default:
fprintf(stderr, "%s: Illegal option %s\n", Argv[0], Argv[1]); fprintf(stderr, "%s: Illegal option %s\n", Argv[0], Argv[1]);
usage(1); usage(1);