george/fiche
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wrap printf in info() and replace a couple of printf statements

Browse Source
This commit is contained in:
Björn Ketelaars
2015-09-04 11:59:44 +02:00
parent 89c5fc8680
commit 7a2b8b1888
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
fiche.c
View File

@@ -134,7 +134,7 @@ void perform_connection(int listen_socket)
void display_date() void display_date()
{ {
printf("%s\n", get_date()); info("%s\n", get_date());
} }
char *get_date() char *get_date()
@@ -160,7 +160,7 @@ struct client_data get_client_address(struct sockaddr_in client_address)
hostp = gethostbyaddr((const char *)&client_address.sin_addr.s_addr, sizeof(client_address.sin_addr.s_addr), AF_INET); hostp = gethostbyaddr((const char *)&client_address.sin_addr.s_addr, sizeof(client_address.sin_addr.s_addr), AF_INET);
if (hostp == NULL) if (hostp == NULL)
{ {
printf("ERROR: Couldn't obtain client's hostname\n"); info("ERROR: Couldn't obtain client's hostname\n");
data.hostname = "n/a"; data.hostname = "n/a";
} }
else else
@@ -169,7 +169,7 @@ struct client_data get_client_address(struct sockaddr_in client_address)
hostaddrp = inet_ntoa(client_address.sin_addr); hostaddrp = inet_ntoa(client_address.sin_addr);
if (hostaddrp == NULL) if (hostaddrp == NULL)
{ {
printf("ERROR: Couldn't obtain client's address\n"); info("ERROR: Couldn't obtain client's address\n");
data.ip_address = "n/a"; data.ip_address = "n/a";
} }
else else
@@ -199,11 +199,11 @@ void save_log(char *slug, char *hostaddrp, char *h_name)
void display_info(struct client_data data, char *slug, char *message) void display_info(struct client_data data, char *slug, char *message)
{ {
if (slug == NULL) if (slug == NULL)
printf("%s\n", message); info("%s\n", message);
else printf("Saved to: %s\n", slug); else info("Saved to: %s\n", slug);
display_date(); display_date();
printf("Client: %s (%s)\n", data.ip_address, data.hostname); info("Client: %s (%s)\n", data.ip_address, data.hostname);
printf("====================================\n"); info("====================================\n");
} }
char *check_banlist(char *ip_address) char *check_banlist(char *ip_address)
@@ -362,11 +362,16 @@ void set_basedir()
void startup_message() void startup_message()
{ {
printf("====================================\n"); info("====================================\n");
printf("Domain name: %s\n", DOMAIN); info("Domain name: %s\n", DOMAIN);
printf("Saving files to: %s\n", BASEDIR); info("Saving files to: %s\n", BASEDIR);
printf("Fiche started listening on port %d.\n", PORT); info("Fiche started listening on port %d.\n", PORT);
printf("====================================\n"); info("====================================\n");
}
void info(char *buffer, ...)
{
printf(buffer);
} }
void parse_parameters(int argc, char **argv) void parse_parameters(int argc, char **argv)
@@ -387,7 +392,7 @@ void parse_parameters(int argc, char **argv)
break; break;
case 'B': case 'B':
BUFSIZE = atoi(optarg); BUFSIZE = atoi(optarg);
printf("Buffer size set to: %d.\n", BUFSIZE); info("Buffer size set to: %d.\n", BUFSIZE);
break; break;
case 'b': case 'b':
BANFILE = optarg; BANFILE = optarg;
@@ -395,14 +400,14 @@ void parse_parameters(int argc, char **argv)
break; break;
case 's': case 's':
SLUG_SIZE = atoi(optarg); SLUG_SIZE = atoi(optarg);
printf("Slug size set to: %d.\n", SLUG_SIZE); info("Slug size set to: %d.\n", SLUG_SIZE);
break; break;
case 'o': case 'o':
BASEDIR = optarg; BASEDIR = optarg;
break; break;
case 'l': case 'l':
LOG = optarg; LOG = optarg;
printf("Log file: %s\n", LOG); info("Log file: %s\n", LOG);
break; break;
case 'u': case 'u':
set_uid_gid(optarg); set_uid_gid(optarg);

1
fiche.h
View File

@@ -90,6 +90,7 @@ void parse_parameters(int argc, char **argv);
void save_log(char *slug, char *hostaddrp, char *h_name); void save_log(char *slug, char *hostaddrp, char *h_name);
void change_owner(char *directory); void change_owner(char *directory);
void set_uid_gid(); void set_uid_gid();
void info(char *buffer, ...);
char *check_banlist(char *ip_address); char *check_banlist(char *ip_address);
char *check_whitelist(char *ip_address); char *check_whitelist(char *ip_address);