diff options
| -rw-r--r-- | networking/nslookup.c | 33 | ||||
| -rw-r--r-- | util-linux/mkfs_minix.c | 55 |
2 files changed, 45 insertions, 43 deletions
diff --git a/networking/nslookup.c b/networking/nslookup.c index 0f3102e..3295106 100644 --- a/networking/nslookup.c +++ b/networking/nslookup.c @@ -5,7 +5,7 @@ * Copyright (C) 1999,2000 by Lineo, inc. and John Beppu * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org> * - * Correct default name server display and explicit name server option + * Correct default name server display and explicit name server option * added by Ben Zeckel <bzeckel@hmc.edu> June 2001 * * This program is free software; you can redistribute it and/or modify @@ -30,6 +30,7 @@ #include <string.h> #include <stdlib.h> +#include <stdint.h> #include <netdb.h> #include <sys/socket.h> #include <sys/types.h> @@ -46,9 +47,9 @@ /* only works for IPv4 */ static int addr_fprint(char *addr) { - u_int8_t split[4]; - u_int32_t ip; - u_int32_t *x = (u_int32_t *) addr; + uint8_t split[4]; + uint32_t ip; + uint32_t *x = (uint32_t *) addr; ip = ntohl(*x); split[0] = (ip & 0xff000000) >> 24; @@ -102,12 +103,12 @@ static struct hostent *hostent_fprint(struct hostent *host, const char *server_h } /* changes a c-string matching the perl regex \d+\.\d+\.\d+\.\d+ - * into a u_int32_t + * into a uint32_t */ -static u_int32_t str_to_addr(const char *addr) +static uint32_t str_to_addr(const char *addr) { - u_int32_t split[4]; - u_int32_t ip; + uint32_t split[4]; + uint32_t ip; sscanf(addr, "%d.%d.%d.%d", &split[0], &split[1], &split[2], &split[3]); @@ -144,12 +145,12 @@ static inline void set_default_dns(char *server) { struct in_addr server_in_addr; - if(inet_aton(server,&server_in_addr)) + if(inet_aton(server,&server_in_addr)) { _res.nscount = 1; _res.nsaddr_list[0].sin_addr = server_in_addr; } -} +} /* naive function to check whether char *s is an ip address */ static int is_ip_address(const char *s) @@ -173,18 +174,18 @@ int nslookup_main(int argc, char **argv) * initialize DNS structure _res used in printing the default * name server and in the explicit name server option feature. */ - + res_init(); /* - * We allow 1 or 2 arguments. - * The first is the name to be looked up and the second is an - * optional DNS server with which to do the lookup. + * We allow 1 or 2 arguments. + * The first is the name to be looked up and the second is an + * optional DNS server with which to do the lookup. * More than 3 arguments is an error to follow the pattern of the * standard nslookup */ - if (argc < 2 || *argv[1]=='-' || argc > 3) + if (argc < 2 || *argv[1]=='-' || argc > 3) bb_show_usage(); else if(argc == 3) set_default_dns(argv[2]); @@ -199,4 +200,4 @@ int nslookup_main(int argc, char **argv) return EXIT_SUCCESS; } -/* $Id: nslookup.c,v 1.30 2003/03/19 09:12:38 mjn3 Exp $ */ +/* $Id: nslookup.c,v 1.31 2004/01/30 22:40:05 andersen Exp $ */ diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index 767f998..0f72b35 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -70,6 +70,7 @@ #include <fcntl.h> #include <ctype.h> #include <stdlib.h> +#include <stdint.h> #include <termios.h> #include <sys/ioctl.h> #include <sys/param.h> @@ -102,13 +103,13 @@ * Note the 8-bit gid and atime and ctime. */ struct minix_inode { - u_int16_t i_mode; - u_int16_t i_uid; - u_int32_t i_size; - u_int32_t i_time; - u_int8_t i_gid; - u_int8_t i_nlinks; - u_int16_t i_zone[9]; + uint16_t i_mode; + uint16_t i_uid; + uint32_t i_size; + uint32_t i_time; + uint8_t i_gid; + uint8_t i_nlinks; + uint16_t i_zone[9]; }; /* @@ -118,35 +119,35 @@ struct minix_inode { * now 16-bit. The inode is now 64 bytes instead of 32. */ struct minix2_inode { - u_int16_t i_mode; - u_int16_t i_nlinks; - u_int16_t i_uid; - u_int16_t i_gid; - u_int32_t i_size; - u_int32_t i_atime; - u_int32_t i_mtime; - u_int32_t i_ctime; - u_int32_t i_zone[10]; + uint16_t i_mode; + uint16_t i_nlinks; + uint16_t i_uid; + uint16_t i_gid; + uint32_t i_size; + uint32_t i_atime; + uint32_t i_mtime; + uint32_t i_ctime; + uint32_t i_zone[10]; }; /* * minix super-block data on disk */ struct minix_super_block { - u_int16_t s_ninodes; - u_int16_t s_nzones; - u_int16_t s_imap_blocks; - u_int16_t s_zmap_blocks; - u_int16_t s_firstdatazone; - u_int16_t s_log_zone_size; - u_int32_t s_max_size; - u_int16_t s_magic; - u_int16_t s_state; - u_int32_t s_zones; + uint16_t s_ninodes; + uint16_t s_nzones; + uint16_t s_imap_blocks; + uint16_t s_zmap_blocks; + uint16_t s_firstdatazone; + uint16_t s_log_zone_size; + uint32_t s_max_size; + uint16_t s_magic; + uint16_t s_state; + uint32_t s_zones; }; struct minix_dir_entry { - u_int16_t inode; + uint16_t inode; char name[0]; }; |