emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-{bin,repo}: make sure that user has write permission on {root,meta,cache}dir.

Browse Source 
Fixes issue #27
This commit is contained in:
Juan RP
2012-08-02 12:20:18 +02:00
parent cae219c4de
commit 3a247bd5cb
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/xbps-bin/main.c
View File

@@ -232,6 +232,25 @@ main(int argc, char **argv)
maxcols = get_maxcols(); maxcols = get_maxcols();
/*
* Check that we have write permission on rootdir, metadir and cachedir.
*/
if (((strcasecmp(argv[0], "install") == 0) ||
(strcasecmp(argv[0], "update") == 0) ||
(strcasecmp(argv[0], "remove") == 0) ||
(strcasecmp(argv[0], "dist-upgrade") == 0) ||
(strcasecmp(argv[0], "remove-orphans") == 0)) && !dry_run) {
if ((access(xh.rootdir, W_OK) == -1) ||
(access(xh.metadir, W_OK) == -1) ||
(access(xh.cachedir, W_OK) == -1)) {
xbps_error_printf("xbps-bin: cannot write to "
"rootdir/cachedir/metadir: %s\n",
strerror(errno));
xbps_end(&xh);
exit(EXIT_FAILURE);
}
}
if (strcasecmp(argv[0], "list") == 0) { if (strcasecmp(argv[0], "list") == 0) {
/* Lists packages currently registered in database. */ /* Lists packages currently registered in database. */
if (argc < 1 || argc > 2) if (argc < 1 || argc > 2)

14
bin/xbps-repo/main.c
View File

@@ -151,6 +151,20 @@ main(int argc, char **argv)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/*
* Check that we have write permission on cachedir/metadir.
*/
if ((strcasecmp(argv[0], "sync") == 0) ||
(strcasecmp(argv[0], "clean") == 0)) {
if ((access(xh.metadir, W_OK) == -1) ||
(access(xh.cachedir, W_OK) == -1)) {
xbps_error_printf("xbps-repo: cannot write to "
"cachedir/metadir: %s\n", strerror(errno));
xbps_end(&xh);
exit(EXIT_FAILURE);
}
}
if (strcasecmp(argv[0], "list") == 0) { if (strcasecmp(argv[0], "list") == 0) {
/* Lists all repositories registered in pool. */ /* Lists all repositories registered in pool. */
if (argc != 1) if (argc != 1)