database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-15 19:21:59 +03:00
Code Activity

Refactor logic to remove trailing CR/LF characters from strings

Browse Source 
b654714 has reworked the way trailing CR/LF characters are removed from
strings.  This commit introduces a new routine in common/string.c and
refactors the code so as the logic is in a single place, mostly.

Author: Michael Paquier
Reviewed-by: Bruce Momjian
Discussion: https://postgr.es/m/20190801031820.GF29334@paquier.xyz
This commit is contained in:
Michael Paquier
2019-08-09 11:05:14 +09:00
parent 28b901f73a
commit b8f2da0ac5
8 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/interfaces/libpq/fe-connect.c
View File

@ -73,6 +73,7 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
#include "common/ip.h"
#include "common/link-canary.h"
#include "common/scram-common.h"
#include "common/string.h"
#include "mb/pg_wchar.h"
#include "port/pg_bswap.h"
@ -6911,12 +6912,8 @@ passwordFromFile(const char *hostname, const char *port, const char *dbname,
if (fgets(buf, sizeof(buf), fp) == NULL)
break;
len = strlen(buf);
/* Remove trailing newline, including \r in case we're on Windows */
while (len > 0 && (buf[len - 1] == '\n' ||
buf[len - 1] == '\r'))
buf[--len] = '\0';
/* strip trailing newline and carriage return */
len = pg_strip_crlf(buf);
if (len == 0)
continue;