NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6cfb3a3

committed

Strip Windows newlines from extension script files manually.

Revert commit924e039 in favor of adding code to convert \r\n to \nexplicitly, on Windows only. The idea of letting text mode do thework fails for a couple of reasons:* Per Microsoft documentation, text mode also causes control-Z to beinterpreted as end-of-file. While it may be unlikely that extensionscripts contain control-Z, we've historically allowed it, and breakingthe case doesn't seem wise.* Apparently, on some Windows configurations, "r" mode is interpretedas binary not text mode. We could force it with "rt" but that wouldbe inconsistent with our code elsewhere, and it would still requireWindows-specific coding.Thanks to Alexander Lakhin for investigation.Discussion:https://postgr.es/m/79284195-4993-7b00-f6df-8db28ca60fa3@gmail.com

1 parent8a98822 commit6cfb3a3Copy full SHA for 6cfb3a3

File tree

1 file changed

+34

-4

lines changed

src/backend/commands
- extension.c

1 file changed

+34

-4

lines changed

`‎src/backend/commands/extension.c`

Lines changed: 34 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -724,6 +724,10 @@ script_error_callback(void *arg)`
`724`	`724`	`* certainly possible to fool this with semicolon-newline embedded`
`725`	`725`	`* in a string literal, but it seems better to do this than to`
`726`	`726`	`* show the entire extension script.`
	`727`	`+ *`
	`728`	`+ * Notice we cope with Windows-style newlines (\r\n) regardless of`
	`729`	`+ * platform. This is because there might be such newlines in`
	`730`	`+ * script files on other platforms.`
`727`	`731`	`*/`
`728`	`732`	`intslen=strlen(query);`
`729`	`733`
`@@ -3618,7 +3622,8 @@ ExecAlterExtensionContentsRecurse(AlterExtensionContentsStmt *stmt,`
`3618`	`3622`	`* Read the whole of file into memory.`
`3619`	`3623`	`*`
`3620`	`3624`	`* The file contents are returned as a single palloc'd chunk. For convenience`
`3621`		`- * of the callers, an extra \0 byte is added to the end.`
	`3625`	`+ * of the callers, an extra \0 byte is added to the end. That is not counted`
	`3626`	`+ * in the length returned into *length.`
`3622`	`3627`	`*/`
`3623`	`3628`	`staticchar*`
`3624`	`3629`	`read_whole_file(constcharfilename,intlength)`
`@@ -3639,15 +3644,15 @@ read_whole_file(const char filename, int length)`
`3639`	`3644`	`errmsg("file \"%s\" is too large",filename)));`
`3640`	`3645`	`bytes_to_read= (size_t)fst.st_size;`
`3641`	`3646`
`3642`		`-if ((file=AllocateFile(filename,"r"))==NULL)`
	`3647`	`+if ((file=AllocateFile(filename,PG_BINARY_R))==NULL)`
`3643`	`3648`	`ereport(ERROR,`
`3644`	`3649`	`(errcode_for_file_access(),`
`3645`	`3650`	`errmsg("could not open file \"%s\" for reading: %m",`
`3646`	`3651`	`filename)));`
`3647`	`3652`
`3648`	`3653`	`buf= (char*)palloc(bytes_to_read+1);`
`3649`	`3654`
`3650`		`-*length=fread(buf,1,bytes_to_read,file);`
	`3655`	`+bytes_to_read=fread(buf,1,bytes_to_read,file);`
`3651`	`3656`
`3652`	`3657`	`if (ferror(file))`
`3653`	`3658`	`ereport(ERROR,`
`@@ -3656,6 +3661,31 @@ read_whole_file(const char filename, int length)`
`3656`	`3661`
`3657`	`3662`	`FreeFile(file);`
`3658`	`3663`
`3659`		`-buf[*length]='\0';`
	`3664`	`+buf[bytes_to_read]='\0';`
	`3665`	`+`
	`3666`	`+/*`
	`3667`	`+ * On Windows, manually convert Windows-style newlines (\r\n) to the Unix`
	`3668`	`+ * convention of \n only. This avoids gotchas due to script files`
	`3669`	`+ * possibly getting converted when being transferred between platforms.`
	`3670`	`+ * Ideally we'd do this by using text mode to read the file, but that also`
	`3671`	`+ * causes control-Z to be treated as end-of-file. Historically we've`
	`3672`	`+ * allowed control-Z in script files, so breaking that seems unwise.`
	`3673`	`+ */`
	`3674`	`+#ifdefWIN32`
	`3675`	`+{`
	`3676`	`+char*s,`
	`3677`	`+*d;`
	`3678`	`+`
	`3679`	`+for (s=d=buf;*s;s++)`
	`3680`	`+{`
	`3681`	`+if (!(*s=='\r'&&s[1]=='\n'))`
	`3682`	`+d++=s;`
	`3683`	`+}`
	`3684`	`+*d='\0';`
	`3685`	`+bytes_to_read=d-buf;`
	`3686`	`+}`
	`3687`	`+#endif`
	`3688`	`+`
	`3689`	`+*length=bytes_to_read;`
`3660`	`3690`	`returnbuf;`
`3661`	`3691`	`}`

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!

Commit6cfb3a3

File tree

1 file changed

1 file changed

`‎src/backend/commands/extension.c`

0 commit comments