NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit980a70b

committed

Fix our getopt_long's behavior for a command line argument of just "-".

src/port/getopt_long.c failed on such an argument, always seeing itas an unrecognized switch. This is unhelpful; better is to treat suchan item as a non-switch argument. That behavior is what we find inGNU's getopt_long(); it's what src/port/getopt.c does; and it isrequired by POSIX for getopt(), which getopt_long() ought to begenerally a superset of. Moreover, it's expected by ecpg, whichintends an argument of "-" to mean "read from stdin". So fix it.Also add some documentation about ecpg's behavior in this area, sincethat was miserably underdocumented. I had to reverse-engineer itfrom the code.Per bug #16304 from James Gray. Back-patch to all supported branches,since this has been broken forever.Discussion:https://postgr.es/m/16304-c662b00a1322db7f@postgresql.org

1 parentc81bd3b commit980a70bCopy full SHA for 980a70b

File tree

2 files changed

+37

-8

lines changed

doc/src/sgml/ref
- ecpg-ref.sgml
src/port
- getopt_long.c

2 files changed

+37

-8

lines changed

`‎doc/src/sgml/ref/ecpg-ref.sgml`

Lines changed: 26 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,21 @@ PostgreSQL documentation`
`41`	`41`
`42`	`42`	`<para>`
`43`	`43`	`<command>ecpg</command> will convert each input file given on the`
`44`		`- command line to the corresponding C output file.Input files`
`45`		`-preferablyhavethe extension <filename>.pgc</filename>.`
`46`		`- The extension will be replaced by <filename>.c</filename> to`
`47`		`-determine the output file name.`
`48`		`-Theoutput file name can also be overridden using the`
	`44`	`+ command line to the corresponding C output file.If an input file`
	`45`	`+name does nothaveany extension, <filename>.pgc</filename> is`
	`46`	`+assumed.Thefile'sextension will be replaced`
	`47`	`+by <filename>.c</filename> to construct the output file name.`
	`48`	`+But theoutput file name can be overridden using the`
`49`	`49`	`<option>-o</option> option.`
`50`	`50`	`</para>`
`51`	`51`
	`52`	`+ <para>`
	`53`	`+ If an input file name is just <literal>-</literal>,`
	`54`	`+ <command>ecpg</command> reads the program from standard input`
	`55`	`+ (and writes to standard output, unless that is overridden`
	`56`	`+ with <option>-o</option>).`
	`57`	`+ </para>`
	`58`	`+`
`52`	`59`	`<para>`
`53`	`60`	`This reference page does not describe the embedded SQL language.`
`54`	`61`	`See <xref linkend="ecpg"/> for more information on that topic.`
`@@ -94,6 +101,19 @@ PostgreSQL documentation`
`94`	`101`	`</listitem>`
`95`	`102`	`</varlistentry>`
`96`	`103`
	`104`	`+ <varlistentry>`
	`105`	`+ <term><option>-h</option></term>`
	`106`	`+ <listitem>`
	`107`	`+ <para>`
	`108`	`+ Process header files. When this option is specified, the output file`
	`109`	`+ extension becomes <literal>.h</literal> not <literal>.c</literal>,`
	`110`	`+ and the default input file extension is <literal>.pgh</literal>`
	`111`	`+ not <literal>.pgc</literal>. Also, the <option>-c</option> option is`
	`112`	`+ forced on.`
	`113`	`+ </para>`
	`114`	`+ </listitem>`
	`115`	`+ </varlistentry>`
	`116`	`+`
`97`	`117`	`<varlistentry>`
`98`	`118`	`<term><option>-i</option></term>`
`99`	`119`	`<listitem>`
`@@ -125,6 +145,7 @@ PostgreSQL documentation`
`125`	`145`	`<para>`
`126`	`146`	`Specifies that <command>ecpg</command> should write all`
`127`	`147`	`its output to the given <replaceable>filename</replaceable>.`
	`148`	`+ Write <literal>-o -</literal> to send all output to standard output.`
`128`	`149`	`</para>`
`129`	`150`	`</listitem>`
`130`	`151`	`</varlistentry>`

`‎src/port/getopt_long.c`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,14 +79,22 @@ getopt_long(int argc, char *const argv[],`
`79`	`79`
`80`	`80`	`place++;`
`81`	`81`
`82`		`-if (place[0]&&place[0]=='-'&&place[1]=='\0')`
`83`		`-{/* found "--" */`
	`82`	`+if (!*place)`
	`83`	`+{`
	`84`	`+/* treat "-" as not being an option */`
	`85`	`+place=EMSG;`
	`86`	`+return-1;`
	`87`	`+}`
	`88`	`+`
	`89`	`+if (place[0]=='-'&&place[1]=='\0')`
	`90`	`+{`
	`91`	`+/* found "--", treat it as end of options */`
`84`	`92`	`++optind;`
`85`	`93`	`place=EMSG;`
`86`	`94`	`return-1;`
`87`	`95`	`}`
`88`	`96`
`89`		`-if (place[0]&&place[0]=='-'&&place[1])`
	`97`	`+if (place[0]=='-'&&place[1])`
`90`	`98`	`{`
`91`	`99`	`/* long option */`
`92`	`100`	`size_tnamelen;`

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!

Commit980a70b

File tree

2 files changed

2 files changed

`‎doc/src/sgml/ref/ecpg-ref.sgml`

`‎src/port/getopt_long.c`

0 commit comments