Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 6c32c7d
pkg-backup: Support -q
Bryan Drewery committed 11 years ago
commit 6c32c7d375260ebc6069ee44789109a8308d4280
parent 1334d52
2 files changed +16 -6
modified docs/pkg-backup.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8

.\" $FreeBSD$

.\"
- 
.Dd May 25, 2014
+ 
.Dd August 18, 2014

.Dt PKG-BACKUP 8

.Os

.Sh NAME
@@ -23,13 +23,17 @@
.Nd backup and restore the local package database

.Sh SYNOPSIS

.Nm
+ 
.Op Fl q

.Fl d Ar dest_file

.Nm
+ 
.Op Fl q

.Fl r Ar src_file

.Pp

.Nm
+ 
.Op Cm --quiet

.Cm --dump Ar dest_file

.Nm
+ 
.Op Cm --quiet

.Cm --restore Ar src_file

.Sh DESCRIPTION

is used for backing up and restoring of the local package database.
@@ -44,6 +48,8 @@ If
is specified as the argument

.Nm

will use stdout for its output.
+ 
.It Fl q , Cm --quiet
+ 
Force quiet output.

.It Fl r Ar src_file , Cm --restore Ar src_file

Uses

.Ar src_file
modified src/backup.c
@@ -36,8 +36,8 @@
void

usage_backup(void)

{
- 
	fprintf(stderr, "Usage: pkg backup -d <dest_file>\n");
- 
	fprintf(stderr, "       pkg backup -r <src_file>\n\n");
+ 
	fprintf(stderr, "Usage: pkg backup [-q] -d <dest_file>\n");
+ 
	fprintf(stderr, "       pkg backup [-q] -r <src_file>\n\n");

	fprintf(stderr, "For more information see 'pkg help backup'.\n");

}
@@ -52,16 +52,20 @@ exec_backup(int argc, char **argv)


	struct option longopts[] = {

		{ "dump",	required_argument,	NULL,	'd' },
+ 
		{ "quiet",	no_argument,		NULL,	'q' },

		{ "restore",	required_argument,	NULL,	'r' },

		{ NULL,		0,			NULL,	0   },

	};
- 
	while ((ch = getopt_long(argc, argv, "+d:r:", longopts, NULL)) != -1) {
+ 
	while ((ch = getopt_long(argc, argv, "+d:qr:", longopts, NULL)) != -1) {

		switch (ch) {

		case 'd':

			dump = true;

			backup_file = optarg;

			break;
+ 
		case 'q':
+ 
			quiet = true;
+ 
			break;

		case 'r':

			restore = true;

			backup_file = optarg;
@@ -83,8 +87,8 @@ exec_backup(int argc, char **argv)
		return (EX_IOERR);



	if (dump) {
- 
		if (isatty(fileno(stdout)))
- 
				printf("Dumping database:\n");
+ 
		if (!quiet && isatty(STDOUT_FILENO))
+ 
			printf("Dumping database:\n");

		if (pkgdb_dump(db, backup_file) == EPKG_FATAL)

			return (EX_IOERR);

	}