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

Cleaning up formatting and error messages in storedPlaylist.c.

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@6263 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2007-05-25 20:25:11 +00:00
parent 2814b7cfc6
commit fc094c08d3
1 changed files with 25 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/storedPlaylist.c
View File

@ -113,15 +113,11 @@ StoredPlaylist *newStoredPlaylist(const char *utf8name, int fd, int ignoreExisti
if (utf8name) { if (utf8name) {
filename = utf8pathToFsPathInStoredPlaylist(utf8name, fd); filename = utf8pathToFsPathInStoredPlaylist(utf8name, fd);
if (filename && stat(filename, &buf) == 0 && ignoreExisting == 0) { if (filename && stat(filename, &buf) == 0 &&
if (fd != -1) ignoreExisting == 0) {
commandError(fd, ACK_ERROR_EXIST, commandError(fd, ACK_ERROR_EXIST,
"a file or directory already " "a file or directory already exists with "
"exists with the name \"%s\"", "the name \"%s\"", utf8name);
utf8name);
ERROR("a file or directory already exists with the "
"name \"%s\"\n", utf8name);
free(sp); free(sp);
return NULL; return NULL;
@ -340,20 +336,13 @@ int removeAllFromStoredPlaylistByPath(int fd, const char *utf8path)
FILE *file; FILE *file;
filename = utf8pathToFsPathInStoredPlaylist(utf8path, fd); filename = utf8pathToFsPathInStoredPlaylist(utf8path, fd);
if (!filename) { if (!filename)
return -1; return -1;
}
while (!(file = fopen(filename, "w")) && errno == EINTR); while (!(file = fopen(filename, "w")) && errno == EINTR);
if (file == NULL) { if (file == NULL) {
if (fd != -1) { commandError(fd, ACK_ERROR_NO_EXIST, "could not open file "
commandError(fd, ACK_ERROR_NO_EXIST, "\"%s\": %s", filename, strerror(errno));
"could not open file \"%s\": %s", filename,
strerror(errno));
}
ERROR("could not open file \"%s\": %s\n", filename,
strerror(errno));
return -1; return -1;
} }
@ -365,8 +354,8 @@ static int removeOneSongFromStoredPlaylist(int fd, StoredPlaylist *sp, int pos)
{ {
ListNode *node = nodeOfStoredPlaylist(sp, pos); ListNode *node = nodeOfStoredPlaylist(sp, pos);
if (!node) { if (!node) {
commandError(fd, ACK_ERROR_ARG, "could not find song at " commandError(fd, ACK_ERROR_ARG,
"position"); "could not find song at position");
return -1; return -1;
} }
@ -439,11 +428,10 @@ static void appendSongToStoredPlaylist(StoredPlaylist *sp, Song *song)
{ {
char *s; char *s;
if (playlist_saveAbsolutePaths && song->type == SONG_TYPE_FILE) { if (playlist_saveAbsolutePaths && song->type == SONG_TYPE_FILE)
s = rmp2amp(utf8ToFsCharset(getSongUrl(song))); s = rmp2amp(utf8ToFsCharset(getSongUrl(song)));
} else { else
s = utf8ToFsCharset(getSongUrl(song)); s = utf8ToFsCharset(getSongUrl(song));
}
insertInListWithoutKey(sp->list, strdup(s)); insertInListWithoutKey(sp->list, strdup(s));
} }
@ -454,29 +442,20 @@ int appendSongToStoredPlaylistByPath(int fd, const char *utf8path, Song *song)
FILE *file; FILE *file;
filename = utf8pathToFsPathInStoredPlaylist(utf8path, fd); filename = utf8pathToFsPathInStoredPlaylist(utf8path, fd);
if (!filename) { if (!filename)
return -1; return -1;
}
while (!(file = fopen(filename, "a")) && errno == EINTR); while (!(file = fopen(filename, "a")) && errno == EINTR);
if (file == NULL) { if (file == NULL) {
if (fd != -1) { commandError(fd, ACK_ERROR_NO_EXIST, "could not open file "
commandError(fd, ACK_ERROR_NO_EXIST, "\"%s\": %s", filename, strerror(errno));
"Could not open file \"%s\": %s", filename,
strerror(errno));
}
ERROR("could not open file \"%s\": %s\n", filename,
strerror(errno));
return -1; return -1;
} }
if (playlist_saveAbsolutePaths && song->type == SONG_TYPE_FILE) { if (playlist_saveAbsolutePaths && song->type == SONG_TYPE_FILE)
fprintf(file, "%s\n", rmp2amp(utf8ToFsCharset(getSongUrl(song)))); fprintf(file, "%s\n", rmp2amp(utf8ToFsCharset(getSongUrl(song))));
} else { else
fprintf(file, "%s\n", utf8ToFsCharset(getSongUrl(song))); fprintf(file, "%s\n", utf8ToFsCharset(getSongUrl(song)));
}
while (fclose(file) != 0 && errno == EINTR); while (fclose(file) != 0 && errno == EINTR);
return 0; return 0;
@ -485,9 +464,8 @@ int appendSongToStoredPlaylistByPath(int fd, const char *utf8path, Song *song)
void appendPlaylistToStoredPlaylist(StoredPlaylist *sp, Playlist *playlist) void appendPlaylistToStoredPlaylist(StoredPlaylist *sp, Playlist *playlist)
{ {
int i; int i;
for (i = 0; i < playlist->length; i++) { for (i = 0; i < playlist->length; i++)
appendSongToStoredPlaylist(sp, playlist->songs[i]); appendSongToStoredPlaylist(sp, playlist->songs[i]);
}
} }
int renameStoredPlaylist(int fd, const char *utf8from, const char *utf8to) int renameStoredPlaylist(int fd, const char *utf8from, const char *utf8to)
@ -508,41 +486,25 @@ int renameStoredPlaylist(int fd, const char *utf8from, const char *utf8to)
} }
if (stat(from, &st) != 0) { if (stat(from, &st) != 0) {
if (fd != -1) { commandError(fd, ACK_ERROR_NO_EXIST,
commandError(fd, ACK_ERROR_NO_EXIST, "no playlist named \"%s\"", utf8from);
"no playlist named \"%s\"", utf8from);
}
ERROR("no playlist named \"%s\"\n", utf8from);
ret = -1; ret = -1;
goto out; goto out;
} }
if (stat(to, &st) == 0) { if (stat(to, &st) == 0) {
if (fd != -1) { commandError(fd, ACK_ERROR_EXIST, "a file or directory "
commandError(fd, ACK_ERROR_EXIST, "a file or directory " "already exists with the name \"%s\"", utf8to);
"already exists with the name \"%s\"",
utf8to);
}
ERROR("a file or directory already exists with the "
"name \"%s\"\n", utf8to);
ret = -1; ret = -1;
goto out; goto out;
} }
if (rename(from, to) < 0) { if (rename(from, to) < 0) {
if (fd != -1) { commandError(fd, ACK_ERROR_UNKNOWN,
commandError(fd, ACK_ERROR_UNKNOWN, "could not rename playlist \"%s\" to \"%s\": %s",
"could not rename playlist \"%s\" to " utf8from, utf8to, strerror(errno));
"\"%s\": %s", utf8from, utf8to,
strerror(errno));
}
ERROR("could not rename playlist \"%s\" to \"%s\": %s\n",
utf8from, utf8to, strerror(errno));
ret = -1; ret = -1;
goto out; goto out;