mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

fix atrocious code, do socket -> FILE* conversion correctly, with proper

Browse Source 
error handling.

okay millert@, otto@
This commit is contained in:
espie 2013-03-07 16:54:28 +00:00
parent 58b5e10fa3
commit c14b1d516c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/cdio/cddb.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cddb.c,v 1.16 2011/04/06 11:36:26 miod Exp $ */
/* $OpenBSD: cddb.c,v 1.17 2013/03/07 16:54:28 espie Exp $ */
/*
* Copyright (c) 2002 Marc Espie.
*
@ -242,6 +242,7 @@ char **
cddb(const char *host_port, int n, struct cd_toc_entry *e, char *arg)
{
int s = -1;
int s2 = -1;
FILE *cin = NULL;
FILE *cout = NULL;
char *type;
@ -253,17 +254,21 @@ cddb(const char *host_port, int n, struct cd_toc_entry *e, char *arg)
s = parse_connect_to(host_port, "cddb");
if (s == -1)
goto end;
s2 = dup(s);
if (s2 == -1)
goto end;
cin = fdopen(s, "r");
if (!cin) {
warn("cddb: fdopen");
goto end;
}
cout = fdopen(s, "w");
s = -1;
cout = fdopen(s2, "w");
if (!cout) {
warn("cddb: fdopen");
goto end;
}
s2 = -1;
line = get_answer(cin);
if (!line) {
warnx("cddb: won't talk to us");
@ -371,6 +376,8 @@ end:
fclose(cin);
if (s != -1)
close(s);
if (s2 != -1)
close(s2);
return result;
}