aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

actually check the return value of write for rare fail conditions

Browse Source
This commit is contained in:
Will Song 2015-11-23 21:02:23 -06:00
parent 8b9b06c24f
commit d4e0be7176
No known key found for this signature in database
GPG Key ID: F2B1A34F21A171E2
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/command/commands.c
View File

@ -798,9 +798,9 @@ cmd_script(ProfWin *window, const char *const command, gchar **args)
} }
/* escape a string into csv and write it to the file descriptor */ /* escape a string into csv and write it to the file descriptor */
static void static int
writecsv(int fd, const char *const str){ writecsv(int fd, const char *const str){
if(!str) return; if(!str) return 0;
size_t len = strlen(str); size_t len = strlen(str);
char *s = malloc(2 * len * sizeof(char)); char *s = malloc(2 * len * sizeof(char));
char *c = s; char *c = s;
@ -809,9 +809,12 @@ writecsv(int fd, const char *const str){
if(str[i] != '"') *c++ = str[i]; if(str[i] != '"') *c++ = str[i];
else { *c++ = '"'; *c++ = '"'; len++; } else { *c++ = '"'; *c++ = '"'; len++; }
} }
int unused = write(fd, s, len); if(-1 == write(fd, s, len)){
(void)(unused); cons_show("error: failed to write '%s' to the requested file: %s", s, strerror(errno));
return -1;
}
free(s); free(s);
return 0;
} }
gboolean gboolean
@ -823,15 +826,14 @@ cmd_export(ProfWin *window, const char *const command, gchar **args)
int fd = open(args[0], O_WRONLY | O_CREAT, 00600); int fd = open(args[0], O_WRONLY | O_CREAT, 00600);
GSList *list = NULL; GSList *list = NULL;
if(fd == -1){ if(-1 == fd){
cons_show("error: cannot open %s: %s", args[0], strerror(errno)); cons_show("error: cannot open %s: %s", args[0], strerror(errno));
cons_show(""); cons_show("");
return TRUE; return TRUE;
} }
int unused;
(void)(unused);
unused = write(fd, "jid,name\n", strlen("jid,name\n")); if(-1 == write(fd, "jid,name\n", strlen("jid,name\n"))) goto write_error;
list = roster_get_contacts(ROSTER_ORD_NAME, TRUE); list = roster_get_contacts(ROSTER_ORD_NAME, TRUE);
if(list){ if(list){
GSList *curr = list; GSList *curr = list;
@ -841,11 +843,11 @@ cmd_export(ProfWin *window, const char *const command, gchar **args)
const char *name = p_contact_name(contact); const char *name = p_contact_name(contact);
/* write the data to the file */ /* write the data to the file */
unused = write(fd, "\"", 1); if(-1 == write(fd, "\"", 1)) goto write_error;
writecsv(fd, jid); if(-1 == writecsv(fd, jid)) goto write_error;
unused = write(fd, "\",\"", 3); if(-1 == write(fd, "\",\"", 3)) goto write_error;
writecsv(fd, name); if(-1 == writecsv(fd, name)) goto write_error;
unused = write(fd, "\"\n", 2); if(-1 == write(fd, "\"\n", 2)) goto write_error;
/* loop */ /* loop */
curr = g_slist_next(curr); curr = g_slist_next(curr);
@ -857,6 +859,12 @@ cmd_export(ProfWin *window, const char *const command, gchar **args)
cons_show(""); cons_show("");
} }
g_slist_free(list);
close(fd);
return TRUE;
write_error:
cons_show("error: write failed: %s", strerror(errno));
cons_show("");
g_slist_free(list); g_slist_free(list);
close(fd); close(fd);
return TRUE; return TRUE;