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

xbps-create: add -q (quiet), ignore optarg if it's empty.

Browse Source 
(cherry picked from commit 4417f7d74c0d552bba0f625b7df8adf25999000f)
This commit is contained in:
Juan RP 2012-09-23 01:33:51 +02:00
parent 9e5c7de33b
commit b478f6d774
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bin/xbps-create/main.c
View File

@ -78,6 +78,7 @@ usage(void)
" -P, --provides Provides (blank separated list,\n" " -P, --provides Provides (blank separated list,\n"
" e.g: 'foo-9999 blah-1.0').\n" " e.g: 'foo-9999 blah-1.0').\n"
" -p, --preserve Enable package preserve boolean.\n" " -p, --preserve Enable package preserve boolean.\n"
" -q, --quiet Work silently.\n"
" -R, --replaces Replaces (blank separated list,\n" " -R, --replaces Replaces (blank separated list,\n"
" e.g: 'foo>=1.0 blah<2.0').\n" " e.g: 'foo>=1.0 blah<2.0').\n"
" -S, --long-desc Long description (80 cols per line).\n" " -S, --long-desc Long description (80 cols per line).\n"
@ -171,7 +172,8 @@ ftw_cb(const char *fpath, const struct stat *sb, int type, struct FTW *ftwbuf)
if ((strcmp(fpath, ".") == 0) || if ((strcmp(fpath, ".") == 0) ||
(strcmp(fpath, "./props.plist") == 0) || (strcmp(fpath, "./props.plist") == 0) ||
(strcmp(fpath, "./files.plist") == 0) || (strcmp(fpath, "./files.plist") == 0) ||
(strcmp(fpath, "./flist") == 0)) (strcmp(fpath, "./flist") == 0) ||
(strcmp(fpath, "./rdeps") == 0))
return 0; return 0;
/* sanitized file path */ /* sanitized file path */
@ -398,7 +400,7 @@ destroy_xentry(struct xentry *xe)
} }
static void static void
process_archive(struct archive *ar, const char *pkgver) process_archive(struct archive *ar, const char *pkgver, bool quiet)
{ {
struct xentry *xe; struct xentry *xe;
char *xml; char *xml;
@ -433,8 +435,10 @@ process_archive(struct archive *ar, const char *pkgver)
destroy_xentry(xe); destroy_xentry(xe);
continue; continue;
} }
printf("%s: adding `%s' ...\n", pkgver, xe->file); if (!quiet) {
fflush(stdout); printf("%s: adding `%s' ...\n", pkgver, xe->file);
fflush(stdout);
}
process_entry_file(ar, xe, NULL); process_entry_file(ar, xe, NULL);
destroy_xentry(xe); destroy_xentry(xe);
} }
@ -475,6 +479,7 @@ main(int argc, char **argv)
{ "pkgver", required_argument, NULL, 'n' }, { "pkgver", required_argument, NULL, 'n' },
{ "provides", required_argument, NULL, 'P' }, { "provides", required_argument, NULL, 'P' },
{ "preserve", no_argument, NULL, 'p' }, { "preserve", no_argument, NULL, 'p' },
{ "quiet", no_argument, NULL, 'q' },
{ "replaces", required_argument, NULL, 'R' }, { "replaces", required_argument, NULL, 'R' },
{ "long-desc", required_argument, NULL, 'S' }, { "long-desc", required_argument, NULL, 'S' },
{ "desc", required_argument, NULL, 's' }, { "desc", required_argument, NULL, 's' },
@ -487,7 +492,7 @@ main(int argc, char **argv)
const char *provides, *pkgver, *replaces, *desc, *ldesc; const char *provides, *pkgver, *replaces, *desc, *ldesc;
const char *arch, *config_files, *mutable_files, *version; const char *arch, *config_files, *mutable_files, *version;
char *pkgname, *binpkg, *tname, *p, cwd[PATH_MAX-1]; char *pkgname, *binpkg, *tname, *p, cwd[PATH_MAX-1];
bool preserve = false; bool quiet = false, preserve = false;
int c, pkg_fd; int c, pkg_fd;
mode_t myumask; mode_t myumask;
@ -496,7 +501,10 @@ main(int argc, char **argv)
config_files = mutable_files = NULL; config_files = mutable_files = NULL;
while ((c = getopt_long(argc, argv, while ((c = getopt_long(argc, argv,
"A:B:C:D:d:F:h:l:M:m:n:P:pR:S:s:V", longopts, &c)) != -1) { "A:B:C:D:d:F:h:l:M:m:n:P:pqR:S:s:V", longopts, &c)) != -1) {
if (optarg && strcmp(optarg, "") == 0)
optarg = NULL;
switch (c) { switch (c) {
case 'A': case 'A':
arch = optarg; arch = optarg;
@ -537,6 +545,9 @@ main(int argc, char **argv)
case 'p': case 'p':
preserve = true; preserve = true;
break; break;
case 'q':
quiet = true;
break;
case 'R': case 'R':
replaces = optarg; replaces = optarg;
break; break;
@ -655,7 +666,7 @@ main(int argc, char **argv)
if (archive_write_open_fd(ar, pkg_fd) != 0) if (archive_write_open_fd(ar, pkg_fd) != 0)
die("Failed to open %s fd for writing:", tname); die("Failed to open %s fd for writing:", tname);
process_archive(ar, pkgver); process_archive(ar, pkgver, quiet);
archive_write_free(ar); archive_write_free(ar);
/* /*
* Archive was created successfully; flush data to storage, * Archive was created successfully; flush data to storage,
@ -676,7 +687,9 @@ main(int argc, char **argv)
die("cannot rename %s to %s:", tname, binpkg); die("cannot rename %s to %s:", tname, binpkg);
/* Success, release resources */ /* Success, release resources */
printf("%s: binary package created successfully (%s)\n", pkgver, binpkg); if (!quiet)
printf("%s: binary package created successfully (%s)\n",
pkgver, binpkg);
free(binpkg); free(binpkg);
free(pkgname); free(pkgname);