771011a6fc
The code in tagcache.c:commit() was unable to delete the to-be-commited database file as it read from $(HOME)/.config/rockbox.org and tried to delete the file later on in /.rockbox/. As we didn't specify any flags like IS_FILE or NEED_WRITE in _get_user_file_path() (which is called by f.e. app_remove()), it searched for the file in two places. In case of app_rename() IS_FILE would be wrong, so we just add a NEED_WRITE to any write operation. Author: Thomas Jarosch git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29148 a1c6a512-1295-4272-9138-f99709370657
211 lines
5.7 KiB
C
211 lines
5.7 KiB
C
/***************************************************************************
|
|
* __________ __ ___.
|
|
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
|
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
|
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
|
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
|
* \/ \/ \/ \/ \/
|
|
* $Id$
|
|
*
|
|
* Copyright (C) 2010 Thomas Martitz
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
****************************************************************************/
|
|
|
|
|
|
#include <stdio.h> /* snprintf */
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
#include "rbpaths.h"
|
|
#include "file.h" /* MAX_PATH */
|
|
#include "gcc_extensions.h"
|
|
#include "string-extra.h"
|
|
#include "filefuncs.h"
|
|
|
|
#undef open
|
|
#undef creat
|
|
#undef remove
|
|
#undef rename
|
|
#undef opendir
|
|
#undef mkdir
|
|
#undef rmdir
|
|
|
|
#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
|
|
#include "dir-target.h"
|
|
#define opendir opendir_android
|
|
#define mkdir mkdir_android
|
|
#define rmdir rmdir_android
|
|
#elif (CONFIG_PLATFORM & PLATFORM_SDL)
|
|
#define open sim_open
|
|
#define remove sim_remove
|
|
#define rename sim_rename
|
|
#define opendir sim_opendir
|
|
#define mkdir sim_mkdir
|
|
#define rmdir sim_rmdir
|
|
extern int sim_open(const char* name, int o, ...);
|
|
extern int sim_remove(const char* name);
|
|
extern int sim_rename(const char* old, const char* new);
|
|
extern DIR* sim_opendir(const char* name);
|
|
extern int sim_mkdir(const char* name);
|
|
extern int sim_rmdir(const char* name);
|
|
#endif
|
|
|
|
/* flags for get_user_file_path() */
|
|
/* whether you need write access to that file/dir, especially true
|
|
* for runtime generated files (config.cfg) */
|
|
#define NEED_WRITE (1<<0)
|
|
/* file or directory? */
|
|
#define IS_FILE (1<<1)
|
|
|
|
void paths_init(void)
|
|
{
|
|
/* make sure $HOME/.config/rockbox.org exists, it's needed for config.cfg */
|
|
#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
|
|
mkdir("/sdcard/rockbox");
|
|
#else
|
|
char home_path[MAX_PATH];
|
|
snprintf(home_path, sizeof(home_path), "%s/.config/rockbox.org", getenv("HOME"));
|
|
mkdir(home_path);
|
|
#endif
|
|
}
|
|
|
|
static bool try_path(const char* filename, unsigned flags)
|
|
{
|
|
if (flags & IS_FILE)
|
|
{
|
|
if (file_exists(filename))
|
|
return true;
|
|
}
|
|
else
|
|
{
|
|
if (dir_exists(filename))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
static const char* _get_user_file_path(const char *path,
|
|
unsigned flags,
|
|
char* buf,
|
|
const size_t bufsize)
|
|
{
|
|
const char *ret = path;
|
|
const char *pos = path;
|
|
/* replace ROCKBOX_DIR in path with $HOME/.config/rockbox.org */
|
|
pos += ROCKBOX_DIR_LEN;
|
|
if (*pos == '/') pos += 1;
|
|
|
|
#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
|
|
if (snprintf(buf, bufsize, "/sdcard/rockbox/%s", pos)
|
|
#else
|
|
if (snprintf(buf, bufsize, "%s/.config/rockbox.org/%s", getenv("HOME"), pos)
|
|
#endif
|
|
>= (int)bufsize)
|
|
return NULL;
|
|
|
|
/* always return the replacement buffer (pointing to $HOME) if
|
|
* write access is needed */
|
|
if (flags & NEED_WRITE)
|
|
ret = buf;
|
|
else if (try_path(buf, flags))
|
|
ret = buf;
|
|
|
|
if (ret != buf) /* not found in $HOME, try ROCKBOX_BASE_DIR, !NEED_WRITE only */
|
|
{
|
|
if (snprintf(buf, bufsize, ROCKBOX_SHARE_PATH "/%s", pos) >= (int)bufsize)
|
|
return NULL;
|
|
|
|
if (try_path(buf, flags))
|
|
ret = buf;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int app_open(const char *name, int o, ...)
|
|
{
|
|
char realpath[MAX_PATH];
|
|
va_list ap;
|
|
int fd;
|
|
|
|
if (!strncmp(ROCKBOX_DIR, name, ROCKBOX_DIR_LEN))
|
|
{
|
|
int flags = IS_FILE;
|
|
if (o & (O_CREAT|O_RDWR|O_TRUNC|O_WRONLY))
|
|
flags |= NEED_WRITE;
|
|
name = _get_user_file_path(name, flags, realpath, sizeof(realpath));
|
|
}
|
|
va_start(ap, o);
|
|
fd = open(name, o, va_arg(ap, unsigned int));
|
|
va_end(ap);
|
|
|
|
return fd;
|
|
}
|
|
|
|
int app_creat(const char* name, mode_t mode)
|
|
{
|
|
return app_open(name, O_CREAT|O_WRONLY|O_TRUNC, mode);
|
|
}
|
|
|
|
int app_remove(const char *name)
|
|
{
|
|
char realpath[MAX_PATH];
|
|
const char *fname = name;
|
|
if (!strncmp(ROCKBOX_DIR, name, ROCKBOX_DIR_LEN))
|
|
{
|
|
fname = _get_user_file_path(name, NEED_WRITE, realpath, sizeof(realpath));
|
|
}
|
|
|
|
return remove(fname);
|
|
}
|
|
|
|
int app_rename(const char *old, const char *new)
|
|
{
|
|
char realpath[MAX_PATH];
|
|
const char *fname = old;
|
|
if (!strncmp(ROCKBOX_DIR, old, ROCKBOX_DIR_LEN))
|
|
{
|
|
fname = _get_user_file_path(old, NEED_WRITE, realpath, sizeof(realpath));
|
|
}
|
|
return rename(fname, new);
|
|
}
|
|
|
|
DIR *app_opendir(const char *name)
|
|
{
|
|
char realpath[MAX_PATH];
|
|
const char *fname = name;
|
|
if (!strncmp(ROCKBOX_DIR, name, ROCKBOX_DIR_LEN))
|
|
{
|
|
fname = _get_user_file_path(name, 0, realpath, sizeof(realpath));
|
|
}
|
|
return opendir(fname);
|
|
}
|
|
|
|
int app_mkdir(const char* name)
|
|
{
|
|
char realpath[MAX_PATH];
|
|
const char *fname = name;
|
|
if (!strncmp(ROCKBOX_DIR, name, ROCKBOX_DIR_LEN))
|
|
{
|
|
fname = _get_user_file_path(name, NEED_WRITE, realpath, sizeof(realpath));
|
|
}
|
|
return mkdir(fname);
|
|
}
|
|
|
|
int app_rmdir(const char* name)
|
|
{
|
|
char realpath[MAX_PATH];
|
|
const char *fname = name;
|
|
if (!strncmp(ROCKBOX_DIR, name, ROCKBOX_DIR_LEN))
|
|
{
|
|
fname = _get_user_file_path(name, NEED_WRITE, realpath, sizeof(realpath));
|
|
}
|
|
return rmdir(fname);
|
|
}
|