Skip to content

Handle program exit consistently #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle program exit consistently #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions chap01/unix_list.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ int main() {
struct ifaddrs *addresses;

if (getifaddrs(&addresses) == -1) {
printf("getifaddrs call failed\n");
return -1;
fprintf(stderr, "getifaddrs call failed\n");
return 1;
}

struct ifaddrs *address = addresses;
Expand Down
4 changes: 2 additions & 2 deletions chap01/win_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ int main() {
WSADATA d;

if (WSAStartup(MAKEWORD(2, 2), &d)) {
printf("Failed to initialize.\n");
return -1;
fprintf(stderr, "Failed to initialize.\n");
return 1;
}

WSACleanup();
Expand Down
12 changes: 6 additions & 6 deletions chap01/win_list.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ int main() {

WSADATA d;
if (WSAStartup(MAKEWORD(2, 2), &d)) {
printf("Failed to initialize.\n");
return -1;
fprintf(stderr, "Failed to initialize.\n");
return 1;
}


Expand All @@ -50,9 +50,9 @@ int main() {
adapters = (PIP_ADAPTER_ADDRESSES)malloc(asize);

if (!adapters) {
printf("Couldn't allocate %ld bytes for adapters.\n", asize);
fprintf(stderr, "Couldn't allocate %ld bytes for adapters.\n", asize);
WSACleanup();
return -1;
return 1;
}

int r = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, 0,
Expand All @@ -63,10 +63,10 @@ int main() {
} else if (r == ERROR_SUCCESS) {
break;
} else {
printf("Error from GetAdaptersAddresses: %d\n", r);
fprintf(stderr, "Error from GetAdaptersAddresses: %d\n", r);
free(adapters);
WSACleanup();
return -1;
return 1;
}
} while (!adapters);

Expand Down
2 changes: 1 addition & 1 deletion chap03/tcp_serve_toupper_fork.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ int main() {
int bytes_received = recv(socket_client, read, 1024, 0);
if (bytes_received < 1) {
CLOSESOCKET(socket_client);
exit(0);
return 0;
}

int j;
Expand Down
10 changes: 5 additions & 5 deletions chap05/dns_query.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,14 @@ void print_dns_message(const char *message, int msg_length) {
int main(int argc, char *argv[]) {

if (argc < 3) {
printf("Usage:\n\tdns_query hostname type\n");
printf("Example:\n\tdns_query example.com aaaa\n");
exit(0);
fprintf(stderr, "Usage:\n\tdns_query hostname type\n");
fprintf(stderr, "Example:\n\tdns_query example.com aaaa\n");
return 1;
}

if (strlen(argv[1]) > 253) {
fprintf(stderr, "Hostname too long.");
exit(1);
return 1;
}

unsigned char type;
Expand All @@ -253,7 +253,7 @@ int main(int argc, char *argv[]) {
} else {
fprintf(stderr, "Unknown type '%s'. Use a, aaaa, txt, mx, or any.",
argv[2]);
exit(1);
return 1;
}

#if defined(_WIN32)
Expand Down
6 changes: 3 additions & 3 deletions chap05/lookup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
int main(int argc, char *argv[]) {

if (argc < 2) {
printf("Usage:\n\tlookup hostname\n");
printf("Example:\n\tlookup example.com\n");
exit(0);
fprintf(stderr, "Usage:\n\tlookup hostname\n");
fprintf(stderr, "Example:\n\tlookup example.com\n");
return 1;
}

#if defined(_WIN32)
Expand Down
6 changes: 3 additions & 3 deletions chap09/https_simple.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
struct addrinfo *peer_address;
if (getaddrinfo(hostname, port, &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
exit(1);
return 1;
}

printf("Remote address is: ");
Expand All @@ -79,14 +79,14 @@ int main(int argc, char *argv[]) {
peer_address->ai_socktype, peer_address->ai_protocol);
if (!ISVALIDSOCKET(server)) {
fprintf(stderr, "socket() failed. (%d)\n", GETSOCKETERRNO());
exit(1);
return 1;
}

printf("Connecting...\n");
if (connect(server,
peer_address->ai_addr, peer_address->ai_addrlen)) {
fprintf(stderr, "connect() failed. (%d)\n", GETSOCKETERRNO());
exit(1);
return 1;
}
freeaddrinfo(peer_address);

Expand Down
6 changes: 3 additions & 3 deletions chap09/tls_get_cert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
struct addrinfo *peer_address;
if (getaddrinfo(hostname, port, &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
exit(1);
return 1;
}

printf("Remote address is: ");
Expand All @@ -79,14 +79,14 @@ int main(int argc, char *argv[]) {
peer_address->ai_socktype, peer_address->ai_protocol);
if (!ISVALIDSOCKET(server)) {
fprintf(stderr, "socket() failed. (%d)\n", GETSOCKETERRNO());
exit(1);
return 1;
}

printf("Connecting...\n");
if (connect(server,
peer_address->ai_addr, peer_address->ai_addrlen)) {
fprintf(stderr, "connect() failed. (%d)\n", GETSOCKETERRNO());
exit(1);
return 1;
}
freeaddrinfo(peer_address);

Expand Down
8 changes: 4 additions & 4 deletions chap11/ssh_auth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ int main(int argc, char *argv[])
int ret = ssh_connect(ssh);
if (ret != SSH_OK) {
fprintf(stderr, "ssh_connect() failed.\n%s\n", ssh_get_error(ssh));
return -1;
return 1;
}

printf("Connected to %s on port %d.\n", hostname, port);
Expand All @@ -61,7 +61,7 @@ int main(int argc, char *argv[])
if (ssh_get_server_publickey(ssh, &key) != SSH_OK) {
fprintf(stderr, "ssh_get_server_publickey() failed.\n%s\n",
ssh_get_error(ssh));
return -1;
return 1;
}

unsigned char *hash;
Expand All @@ -70,7 +70,7 @@ int main(int argc, char *argv[])
&hash, &hash_len) != SSH_OK) {
fprintf(stderr, "ssh_get_publickey_hash() failed.\n%s\n",
ssh_get_error(ssh));
return -1;
return 1;
}

printf("Host public key hash:\n");
Expand Down Expand Up @@ -125,7 +125,7 @@ int main(int argc, char *argv[])
{
fprintf(stderr, "ssh_userauth_password() failed.\n%s\n",
ssh_get_error(ssh));
return 0;
return 1;
} else {
printf("Authentication successful!\n");
}
Expand Down
6 changes: 3 additions & 3 deletions chap11/ssh_command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ int main(int argc, char *argv[])
int ret = ssh_connect(ssh);
if (ret != SSH_OK) {
fprintf(stderr, "ssh_connect() failed.\n%s\n", ssh_get_error(ssh));
return -1;
return 1;
}

printf("Connected to %s on port %d.\n", hostname, port);
Expand All @@ -61,7 +61,7 @@ int main(int argc, char *argv[])
if (ssh_get_server_publickey(ssh, &key) != SSH_OK) {
fprintf(stderr, "ssh_get_server_publickey() failed.\n%s\n",
ssh_get_error(ssh));
return -1;
return 1;
}

unsigned char *hash;
Expand All @@ -70,7 +70,7 @@ int main(int argc, char *argv[])
&hash, &hash_len) != SSH_OK) {
fprintf(stderr, "ssh_get_publickey_hash() failed.\n%s\n",
ssh_get_error(ssh));
return -1;
return 1;
}

printf("Host public key hash:\n");
Expand Down
2 changes: 1 addition & 1 deletion chap11/ssh_connect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int main(int argc, char *argv[])
int ret = ssh_connect(ssh);
if (ret != SSH_OK) {
fprintf(stderr, "ssh_connect() failed.\n%s\n", ssh_get_error(ssh));
return -1;
return 1;
}

printf("Connected to %s on port %d.\n", hostname, port);
Expand Down
8 changes: 4 additions & 4 deletions chap11/ssh_download.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ int main(int argc, char *argv[])
int ret = ssh_connect(ssh);
if (ret != SSH_OK) {
fprintf(stderr, "ssh_connect() failed.\n%s\n", ssh_get_error(ssh));
return -1;
return 1;
}

printf("Connected to %s on port %d.\n", hostname, port);
Expand All @@ -61,7 +61,7 @@ int main(int argc, char *argv[])
if (ssh_get_server_publickey(ssh, &key) != SSH_OK) {
fprintf(stderr, "ssh_get_server_publickey() failed.\n%s\n",
ssh_get_error(ssh));
return -1;
return 1;
}

unsigned char *hash;
Expand All @@ -70,7 +70,7 @@ int main(int argc, char *argv[])
&hash, &hash_len) != SSH_OK) {
fprintf(stderr, "ssh_get_publickey_hash() failed.\n%s\n",
ssh_get_error(ssh));
return -1;
return 1;
}

printf("Host public key hash:\n");
Expand Down Expand Up @@ -124,7 +124,7 @@ int main(int argc, char *argv[])
if (ssh_userauth_password(ssh, 0, password) != SSH_AUTH_SUCCESS) {
fprintf(stderr, "ssh_userauth_password() failed.\n%s\n",
ssh_get_error(ssh));
return 0;
return 1;
} else {
printf("Authentication successful!\n");
}
Expand Down
2 changes: 1 addition & 1 deletion chap13/big_send.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) {
return 1;
}
if (r != send_size) {
printf("send() only consumed %d bytes.\n", r);
fprintf(stderr, "send() only consumed %d bytes.\n", r);
return 1;
}

Expand Down