aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update: don't print debug message when song was not modifiedMax Kellermann2008-10-111-4/+5
| | | | | When a song file was not modified, MPD printed the debug message "not a directory or music", because the first "if" branch did not return.
* update: fix memory leak in directory_update_init()Max Kellermann2008-10-111-1/+4
| | | | | When the update queue is full, directory_update_init() did not free the path argument.
* update: make the job id unsignedMax Kellermann2008-10-112-7/+7
| | | | Since the return value cannot be -1 anymore, we can make it unsigned.
* update: job ID must be positiveMax Kellermann2008-10-114-10/+8
| | | | | | | The documentation for directory_update_init() was incorrect: a job ID must be positive, not non-negative. If the update queue is full and no job was created, it makes more sense to return 0 instead of -1, because it is more consistent with the return value of isUpdatingDB().
* update: check progress!=IDLE in reap_update_task()Max Kellermann2008-10-111-0/+3
| | | | | When the update task is idle, there is no need to check for deleted songs. Return early from reap_update_task().
* update: fixed stack corruption due to pthread_join() callMax Kellermann2008-10-111-1/+3
| | | | | | pthread_join() expects a "pointer to a pointer" parameter, but it got a "pointer to an enum". On AMD64, an enum is smaller than a pointer, leading to a buffer overflow.
* updated: always call removeDeletedFromDirectory()Max Kellermann2008-10-111-3/+1
| | | | | Removed the local variable "was_empty": don't remember if the directory is new. Always call removeDeletedFromDirectory().
* update: eliminated addSubDirectoryToDirectory()Max Kellermann2008-10-111-27/+8
| | | | | | In updateInDirectory(), add new directories immediately and delete them when they turn out to be empty. This simplifies the code and allows us to eliminate addSubDirectoryToDirectory().
* update: make the "song" variable more localMax Kellermann2008-10-111-2/+1
|
* update: do the recursive directory check only onceMax Kellermann2008-10-111-9/+6
| | | | | The recursive checks were performed in several functions, and sometimes a directory was checked twice.
* update: copy stat to new directoryMax Kellermann2008-10-111-1/+3
| | | | | | When reading a new directory, copy the stat data (which we have anyway) to the directory struct. This may save a stat() in the future.
* update: avoid duplicate stat() callsMax Kellermann2008-10-111-28/+38
| | | | Pass a pointer to the stat struct to more functions.
* update: rewrote updatePath() using updateInDirectory()Max Kellermann2008-10-111-70/+19
| | | | | | updatePath() duplicated a lot of code from the more generic updateInDirectory(). Eliminate most of updatePath() and call updateInDirectory().
* update: don't export updateDirectory()Max Kellermann2008-10-114-13/+20
| | | | | | | | If the user requests database update during startup, call directory_update_init(). This should be changed to fully asynchronous update later. For this to work, main_notify has to be initialized before db_init().
* update: pass const pointer to addSubDirectoryToDirectory()Max Kellermann2008-10-111-1/+1
| | | | The stat struct isn't going to be modified, make it const.
* update: never pass root path to updatePath()Max Kellermann2008-10-111-6/+1
| | | | | update_task() already checks if it has got a root path. Extend this check and in turn remove a check in the inner function updatePath().
* update: merged addDirectoryPathToDB() into addParentPathToDB()Max Kellermann2008-10-111-23/+3
| | | | | | | The algorithm in addDirectoryPathToDB() can be simplified further if it is combined with the function addParentPathToDB(). Since there is no other caller of addDirectoryPathToDB(), we can do that. This saves another large stack buffer.
* update: make addDirectoryPathToDB() non-recursiveMax Kellermann2008-10-111-11/+13
| | | | | | This recursive function is very dangerous because it allocates a large buffer on the stack in every iteration. That may be misused to generate a stack overflow.
* update: delete directory after failed updateMax Kellermann2008-10-111-1/+8
| | | | | When a directory cannot be updated, there must be something wrong with it, and the database contains stale data. Remove it.
* update: moved code to directory_make_child_checked()Max Kellermann2008-10-111-22/+25
| | | | | | The branching looks a bit complicated in addDirectoryPathToDB() - improve its readability by moving code to a simplified separate function.
* update: clear root after errorMax Kellermann2008-10-111-0/+1
| | | | | When the root directory fails to update, its contents are invalid. Clear it then.
* update: locked delete after update errorMax Kellermann2008-10-111-1/+37
| | | | | | | When a directory failed to update, it was removed from the database, without freeing all children and songs (memory leak), and without locking (race condition). Introduce the functions clear_directory() and delete_directory(), which do both.
* dirvec: added dirvec_clear()Max Kellermann2008-10-111-0/+5
|
* update: removed addToDirectory()Max Kellermann2008-10-111-38/+10
| | | | | | Use updateInDirectory() instead of addToDirectory(). Eliminate a duplicate stat() in updateInDirectory() by calling song_file_update() directly.
* directory: don't query database during loadMax Kellermann2008-10-111-2/+1
| | | | | | Don't use db_get_directory() and traverse the full path with every directory being loaded. Just see if the current parent contains the entry. Everything else would be invalid anyway..
* directory: check the absolute path of a subdirectory while loadingMax Kellermann2008-10-111-0/+4
| | | | | | | A manipulated database could trigger an assertion failure, because the parent didn't match. Do a proper check if the new directory is within the parent's. This uses FATAL() to bail out, so MPD still dies, but it doesn't crash.
* directory: added inline wrappers for accessing childrenMax Kellermann2008-10-113-7/+19
| | | | | Some tiny utilities... wrappers like these may become helpful when we introduce locking.
* dirvec: constant pointers in dirvec_find()Max Kellermann2008-10-112-2/+2
| | | | | dirvec_find() does not modify the object, thus it should get a const pointer.
* directory: moved dirvec struct declaration to dirvec.hMax Kellermann2008-10-113-7/+7
| | | | | No idea why it was created in directory.h, but it should be in dirvec.h.
* diretory: moved code to directory_save.c, directory_print.cMax Kellermann2008-10-118-116/+226
| | | | | | Remove clutter from directory.c. Everything which saves or loads to/from the hard disk goes to directory_save.c, and code which sends directory information to the client is moved into directory_print.c.
* database: removed local variable bufferSizeMax Kellermann2008-10-111-3/+2
| | | | Use sizeof(buffer) instead.
* database: simplify db_load()Max Kellermann2008-10-111-47/+42
| | | | Removed a superfluous closure.
* directory: fix update in root directoryMax Kellermann2008-10-112-4/+3
| | | | | | | Commit 0bfe7802 broke update for new files in the root directory, because music_root->path was an empty string and not NULL. There were some NULL tests missing. Change them to !isRootDirectory(path) instead of path!=NULL.
* directory: path must not be NULLMax Kellermann2008-10-113-10/+10
| | | | | For the root directory, let's set path to an empty string. This saves a few checks.
* directory: directory_get_path(NULL) is not allowedMax Kellermann2008-10-111-3/+4
| | | | | Also convert directory_get_path() to an inline function, which returns a constant string.
* songvec: pass const pointersMax Kellermann2008-10-112-2/+2
| | | | | | Pass const songvec pointers to songvec_find() and songvec_for_each(). [ew: already merged songvec_for_each() cosntification somewhere...]
* directory: eliminate CamelCaseMax Kellermann2008-10-117-50/+50
| | | | | | | | CamelCase is ugly, rename the functions. [ew: "directory_get_directory" was too confusing, using "directory_get_subdir" instead (old function was named "getSubDirectory")]
* database: renamed functions, "db_" prefix and no CamelCaseMax Kellermann2008-10-1112-62/+62
| | | | Yet another CamelCase removal patch.
* database: removed printDirectoryInfo()Max Kellermann2008-10-113-12/+4
| | | | The same can be achieved with directory_print(db_get_directory()).
* directory: moved code to database.cMax Kellermann2008-10-1115-335/+418
| | | | | | Taming the directory.c monster, part II: move the database management stuff to database. directory.c should only contain code which works on directory objects.
* directory: converted isRootDirectory() to an inline functionMax Kellermann2008-10-112-6/+10
| | | | | The function isRootDirectory() is tiny and can be converted to an inline function. Don't allow name==NULL.
* song: use song_file_update() in song_file_load()Max Kellermann2008-10-111-11/+1
| | | | Eliminate duplicated code.
* song: song_file_update() returns booleanMax Kellermann2008-10-112-5/+3
| | | | | | | | | | | | | | Instead of returning 0 or -1, return true on success and false on failure. This seems more natural, and when the C library was designed, there was no "bool" data type. [ew: changing to bool semantics but sticking with integer type since bool is C99 and I don't require a C99 compiler, and I don't feel like writing compatibility wrappers to support it. _Bool is usually (always?) a signed int anyways. ]
* song: don't check song_is_file() in song_file_update()Max Kellermann2008-10-111-24/+24
| | | | | This function was never used on remote songs. Replace the runtime check with an assertion.
* song: removed CamelCaseMax Kellermann2008-10-117-45/+44
| | | | CamelCase is ugly... rename all functions.
* song: replaced all song constructorsMax Kellermann2008-10-114-27/+46
| | | | | | Provide separate constructors for creating a remote song, a local song, and one for loading data from a song file. This way, we can add more assertions.
* playlist: simplified setPlaylistRandomStatus()Max Kellermann2008-10-111-5/+1
| | | | | Check the old status before assigning. This saves a temporary variable.
* CPP include cleanupMax Kellermann2008-10-114-4/+3
| | | | | | Include only headers which are really used. [ew: this is totally different from Max's branch]
* song: converted typedef Song to struct songMax Kellermann2008-10-1115-90/+99
| | | | | | | | | | | | | | | Again, a data type which can be forward-declared. [ew: * used "struct mpd_song" instead to avoid token duplication (like I did with "struct mpd_tag") as there's no good abbreviation for "song" and identical tokens on the same line don't read well * rewritten using perl -i -p -e 's/\bSong\b/struct mpd_song/g' src/*.[ch] since it was too hard to merge * also, I don't care much for forward declarations ]
* directory: converted typedef Directory to struct directoryMax Kellermann2008-10-119-84/+89
| | | | | The struct can be forward-declared by other headers, which relaxes the header dependencies.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 05:50:41 +0000