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

xbps-rindex: added -f --force flag to forcefully register a pkg with -a --add.

Browse Source
This commit is contained in:
Juan RP
2013-05-02 10:46:30 +02:00
parent 30747b1c8b
commit 53217fd51b
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/xbps-rindex/main.c
View File

@@ -1,5 +1,5 @@
/*-
* Copyright (c) 2012 Juan Romero Pardines.
* Copyright (c) 2012-2013 Juan Romero Pardines.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,6 +37,7 @@ usage(bool fail)
fprintf(stdout,
"Usage: xbps-rindex [OPTIONS] MODE ARGUMENTS\n\n"
"OPTIONS\n"
" -f --force Force mode to overwrite entry in add mode\n"
" -h --help Show help usage\n"
" -V --version Show XBPS version\n\n"
"MODE\n"
@@ -49,10 +50,11 @@ usage(bool fail)
int
main(int argc, char **argv)
{
const char *shortopts = "achrV";
const char *shortopts = "acfhrV";
struct option longopts[] = {
{ "add", no_argument, NULL, 'a' },
{ "clean", no_argument, NULL, 'c' },
{ "force", no_argument, NULL, 'f' },
{ "help", no_argument, NULL, 'h' },
{ "remove-obsoletes", no_argument, NULL, 'r' },
{ "version", no_argument, NULL, 'V' },
@@ -60,7 +62,7 @@ main(int argc, char **argv)
};
struct xbps_handle xh;
int rv, c;
bool clean_mode = false, add_mode = false, rm_mode = false;
bool clean_mode = false, add_mode = false, rm_mode = false, force = false;
while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
switch (c) {
@@ -70,6 +72,9 @@ main(int argc, char **argv)
case 'c':
clean_mode = true;
break;
case 'f':
force = true;
break;
case 'h':
usage(false);
/* NOTREACHED */
@@ -100,7 +105,7 @@ main(int argc, char **argv)
}
if (add_mode)
rv = index_add(&xh, argc - optind, argv + optind);
rv = index_add(&xh, argc - optind, argv + optind, force);
else if (clean_mode)
rv = index_clean(&xh, argv[optind]);
else if (rm_mode)