--- trunk/darkstattype.c 2014/03/21 16:04:33 12 +++ trunk/darkstattype.c 2014/03/21 18:35:50 14 @@ -78,22 +78,26 @@ int main(int argc, char **argv) argc -= optind; argv += optind; - if (argv[0] == NULL) { + if (*argv == NULL) { fprintf(stderr, "%s: missing filename\n\n", progname); show_usage(EXIT_FAILURE); } // if - filename = argv[0]; + while (*argv != NULL) { + filename = *argv; - decode_file(); + decode_file(); + argv++; + } // while + return EXIT_SUCCESS; } // main() void show_usage(int exitcode) { fprintf((exitcode == EXIT_SUCCESS) ? stdout : stderr, - "Usage: %s [-f] [-h] [-v] filename\n" + "Usage: %s [-f] [-h] [-v] filename ...\n" " E.g.: %s darkstat.db\n\n" "Options:\n" @@ -208,6 +212,11 @@ void decode_file(void) } // for exdent(); + + if (fclose(file) != 0) { + fprintf(stderr, "%s: fclose(\"%s\") = %s (%d)\n", progname, filename, strerror(errno), errno); + exit(EXIT_FAILURE); + } // if } // decode_file() void decode_host_db_v1(void) @@ -290,7 +299,7 @@ void decode_host_header_v1(void) ipv4address[3] = read8u(); print_indentation(); - printf("IPv4 address %d.%d.%d.%d\n", + printf("IPv4 address %u.%u.%u.%u\n", ipv4address[0], ipv4address[1], ipv4address[2], ipv4address[3]); macaddress[0] = read8u(); @@ -306,7 +315,7 @@ void decode_host_header_v1(void) hostnamelen = read8u(); print_indentation(); - printf("Hostname length %d\n", hostnamelen); + printf("Hostname length %u\n", hostnamelen); for (i = 0; i < hostnamelen; i++) { hostname[i] = read8u(); @@ -373,7 +382,7 @@ void decode_host_header_v2(void) ipv4address[3] = read8u(); print_indentation(); - printf("IPv4 address %d.%d.%d.%d\n", + printf("IPv4 address %u.%u.%u.%u\n", ipv4address[0], ipv4address[1], ipv4address[2], ipv4address[3]); if (follow_specification == true) { @@ -416,7 +425,7 @@ void decode_host_header_v2(void) hostnamelen = read8u(); print_indentation(); - printf("Hostname length %d\n", hostnamelen); + printf("Hostname length %u\n", hostnamelen); for (i = 0; i < hostnamelen; i++) { hostname[i] = read8u(); @@ -489,7 +498,7 @@ void decode_host_header_v3(void) ipv4address[3] = read8u(); print_indentation(); - printf("IPv4 address %d.%d.%d.%d\n", + printf("IPv4 address %u.%u.%u.%u\n", ipv4address[0], ipv4address[1], ipv4address[2], ipv4address[3]); } // if else if (addressfamily == 0x06) { // IPv6 address @@ -561,7 +570,7 @@ void decode_host_header_v3(void) hostnamelen = read8u(); print_indentation(); - printf("Hostname length %d\n", hostnamelen); + printf("Hostname length %u\n", hostnamelen); for (i = 0; i < hostnamelen; i++) { hostname[i] = read8u(); @@ -609,22 +618,22 @@ void decode_protos_data(void) { unsigned char ipprotocount; - unsigned char u; + unsigned char i; ipprotocount = read8u(); print_indentation(); - printf("IP Proto count %d\n", ipprotocount); + printf("IP Proto count %u\n", ipprotocount); indent(); - for (u = 0; u < ipprotocount; u++) { + for (i = 0; i < ipprotocount; i++) { unsigned char proto; unsigned long in; unsigned long out; print_indentation(); - printf("Protocol #%u of %u:\n", u + 1, ipprotocount); + printf("Protocol #%u of %u:\n", i + 1, ipprotocount); proto = read8u(); @@ -657,7 +666,7 @@ void decode_tcp_data(void) tcpprotocount = read16u(); print_indentation(); - printf("TCP proto count %d\n", tcpprotocount); + printf("TCP proto count %u\n", tcpprotocount); indent(); @@ -670,7 +679,7 @@ void decode_tcp_data(void) port = read16u(); print_indentation(); - printf("Port %d:\n", port); + printf("Port %u:\n", port); syn = read64u(); @@ -703,7 +712,7 @@ void decode_udp_data(void) udpprotocount = read16u(); print_indentation(); - printf("UDP proto count %d\n", udpprotocount); + printf("UDP proto count %u\n", udpprotocount); indent(); @@ -715,7 +724,7 @@ void decode_udp_data(void) port = read16u(); print_indentation(); - printf("Port %d:\n", port); + printf("Port %u:\n", port); in = read64u(); @@ -755,7 +764,7 @@ void decode_graph_db_v1(void) unsigned int j; print_indentation(); - printf("Graph #%d of 4:\n", i + 1); + printf("Graph #%u of 4:\n", i + 1); nbars = read8u();