oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

database: I/O error handling in db_save()

Browse Source 
Check ferror() instead of the fprintf() return value.
This commit is contained in:
Max Kellermann 2009-11-07 16:20:07 +01:00
parent 1a4cfc3d90
commit c422344190
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/database.c
View File

@ -251,7 +251,9 @@ db_save(void)
fprintf(fp, "%s\n", DIRECTORY_INFO_END);
if (directory_save(fp, music_root) < 0) {
directory_save(fp, music_root);
if (ferror(fp)) {
g_warning("Failed to write to database file: %s",
strerror(errno));
while (fclose(fp) && errno == EINTR);

29
src/directory_save.c
View File

@ -39,43 +39,38 @@ directory_quark(void)
return g_quark_from_static_string("directory");
}
/* TODO error checking */
int
void
directory_save(FILE *fp, struct directory *directory)
{
struct dirvec *children = &directory->children;
size_t i;
int retv;
if (!directory_is_root(directory)) {
fprintf(fp, DIRECTORY_MTIME "%lu\n",
(unsigned long)directory->mtime);
retv = fprintf(fp, "%s%s\n", DIRECTORY_BEGIN,
directory_get_path(directory));
if (retv < 0)
return -1;
fprintf(fp, "%s%s\n", DIRECTORY_BEGIN,
directory_get_path(directory));
}
for (i = 0; i < children->nr; ++i) {
struct directory *cur = children->base[i];
char *base = g_path_get_basename(cur->path);
retv = fprintf(fp, DIRECTORY_DIR "%s\n", base);
fprintf(fp, DIRECTORY_DIR "%s\n", base);
g_free(base);
if (retv < 0)
return -1;
if (directory_save(fp, cur) < 0)
return -1;
directory_save(fp, cur);
if (ferror(fp))
return;
}
songvec_save(fp, &directory->songs);
if (!directory_is_root(directory) &&
fprintf(fp, DIRECTORY_END "%s\n",
directory_get_path(directory)) < 0)
return -1;
return 0;
if (!directory_is_root(directory))
fprintf(fp, DIRECTORY_END "%s\n",
directory_get_path(directory));
}
static struct directory *

2
src/directory_save.h
View File

@ -27,7 +27,7 @@
struct directory;
int
void
directory_save(FILE *fp, struct directory *directory);
bool