NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitdd7c60f

committed

Introduce long options in pg_archivecleanup

This patch is a preliminary refactoring for an upcoming patch aimed atadding new options to this tool, and using long options for these ismore user-friendly. The existing short options gain long flavors, asof:* -d/--debug* -n/--dry-run* -x/--strip-extensionAuthor: Atsushi TorikoshiReviewed-by: Fujii Masao, Kyotaro Horiguchi, Michael PaquierDiscussion:https://postgr.es/m/d660ef741ce3d82f3b4283f1cafd576c@oss.nttdata.com

1 parentcfc43ae commitdd7c60fCopy full SHA for dd7c60f

File tree

2 files changed

+19

-8

lines changed

doc/src/sgml/ref
- pgarchivecleanup.sgml
src/bin/pg_archivecleanup
- pg_archivecleanup.c

2 files changed

+19

-8

lines changed

`‎doc/src/sgml/ref/pgarchivecleanup.sgml`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ pg_archivecleanup: removing file "archive/00000001000000370000000E"`
`95`	`95`
`96`	`96`	`<varlistentry>`
`97`	`97`	`<term><option>-d</option></term>`
	`98`	`+ <term><option>--debug</option></term>`
`98`	`99`	`<listitem>`
`99`	`100`	`<para>`
`100`	`101`	`Print lots of debug logging output on <filename>stderr</filename>.`
`@@ -104,6 +105,7 @@ pg_archivecleanup: removing file "archive/00000001000000370000000E"`
`104`	`105`
`105`	`106`	`<varlistentry>`
`106`	`107`	`<term><option>-n</option></term>`
	`108`	`+ <term><option>--dry-run</option></term>`
`107`	`109`	`<listitem>`
`108`	`110`	`<para>`
`109`	`111`	`Print the names of the files that would have been removed on <filename>stdout</filename> (performs a dry run).`
`@@ -122,7 +124,8 @@ pg_archivecleanup: removing file "archive/00000001000000370000000E"`
`122`	`124`	`</varlistentry>`
`123`	`125`
`124`	`126`	`<varlistentry>`
`125`		`- <term><option>-x</option> <replaceable>extension</replaceable></term>`
	`127`	`+ <term><option>-x <replaceable class="parameter">extension</replaceable></option></term>`
	`128`	`+ <term><option>--strip-extension=<replaceable class="parameter">extension</replaceable></option></term>`
`126`	`129`	`<listitem>`
`127`	`130`	`<para>`
`128`	`131`	`Provide an extension`

`‎src/bin/pg_archivecleanup/pg_archivecleanup.c`

Lines changed: 15 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`#include"access/xlog_internal.h"`
`19`	`19`	`#include"common/logging.h"`
`20`		`-#include"pg_getopt.h"`
	`20`	`+#include"getopt_long.h"`
`21`	`21`
`22`	`22`	`constchar*progname;`
`23`	`23`
`@@ -252,11 +252,13 @@ usage(void)`
`252`	`252`	`printf(_("Usage:\n"));`
`253`	`253`	`printf(_(" %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n"),progname);`
`254`	`254`	`printf(_("\nOptions:\n"));`
`255`		`-printf(_(" -d generate debug output (verbose mode)\n"));`
`256`		`-printf(_(" -n dry run, show the names of the files that would be removed\n"));`
`257`		`-printf(_(" -V, --version output version information, then exit\n"));`
`258`		`-printf(_(" -x EXT clean up files if they have this extension\n"));`
`259`		`-printf(_(" -?, --help show this help, then exit\n"));`
	`255`	`+printf(_(" -d, --debug generate debug output (verbose mode)\n"));`
	`256`	`+printf(_(" -n, --dry-run dry run, show the names of the files that would be\n"`
	`257`	`+" removed\n"));`
	`258`	`+printf(_(" -V, --version output version information, then exit\n"));`
	`259`	`+printf(_(" -x, --strip-extension=EXT strip this extention before identifying files for\n"`
	`260`	`+" clean up\n"));`
	`261`	`+printf(_(" -?, --help show this help, then exit\n"));`
`260`	`262`	`printf(_("\n"`
`261`	`263`	`"For use as archive_cleanup_command in postgresql.conf:\n"`
`262`	`264`	`" archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n"`
`@@ -274,6 +276,12 @@ usage(void)`
`274`	`276`	`int`
`275`	`277`	`main(intargc,char**argv)`
`276`	`278`	`{`
	`279`	`+staticstructoptionlong_options[]= {`
	`280`	`+{"debug",no_argument,NULL,'d'},`
	`281`	`+{"dry-run",no_argument,NULL,'n'},`
	`282`	`+{"strip-extension",required_argument,NULL,'x'},`
	`283`	`+{NULL,0,NULL,0}`
	`284`	`+};`
`277`	`285`	`intc;`
`278`	`286`
`279`	`287`	`pg_logging_init(argv[0]);`
`@@ -294,7 +302,7 @@ main(int argc, char **argv)`
`294`	`302`	`}`
`295`	`303`	`}`
`296`	`304`
`297`		`-while ((c=getopt(argc,argv,"dnx:"))!=-1)`
	`305`	`+while ((c=getopt_long(argc,argv,"dnx:",long_options,NULL))!=-1)`
`298`	`306`	`{`
`299`	`307`	`switch (c)`
`300`	`308`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitdd7c60f

File tree

2 files changed

2 files changed

`‎doc/src/sgml/ref/pgarchivecleanup.sgml`

`‎src/bin/pg_archivecleanup/pg_archivecleanup.c`

0 commit comments