11
11
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
12
12
* Portions Copyright (c) 1994, Regents of the University of California
13
13
*
14
- * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.46 2008/08/03 05:12:38 tgl Exp $
14
+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.47 2008/08/05 05:16:08 tgl Exp $
15
15
*
16
16
*-------------------------------------------------------------------------
17
17
*/
@@ -141,7 +141,7 @@ unlimit_core_size(void)
141
141
if (lim .rlim_max == 0 )
142
142
{
143
143
fprintf (stderr ,
144
- _ ("%s: cannot set core size, : disallowed by hard limit. \n" ),
144
+ _ ("%s: could not set core size: disallowed by hard limit\n" ),
145
145
progname );
146
146
return ;
147
147
}
@@ -524,7 +524,7 @@ convert_sourcefiles_in(char *source, char *dest, char *suffix)
524
524
*/
525
525
if (count <= 0 )
526
526
{
527
- fprintf (stderr , _ ("%s: no *.source files found in %s \n" ),
527
+ fprintf (stderr , _ ("%s: no *.source files found in \"%s\" \n" ),
528
528
progname , indir );
529
529
exit_nicely (2 );
530
530
}
@@ -965,14 +965,16 @@ spawn_process(const char *cmdline)
965
965
{
966
966
if (Advapi32Handle != NULL )
967
967
FreeLibrary (Advapi32Handle );
968
- fprintf (stderr , "ERROR: cannot create restricted tokens on this platform\n" );
968
+ fprintf (stderr , _ ("%s: cannot create restricted tokens on this platform\n" ),
969
+ progname );
969
970
exit_nicely (2 );
970
971
}
971
972
972
973
/* Open the current token to use as base for the restricted one */
973
974
if (!OpenProcessToken (GetCurrentProcess (), TOKEN_ALL_ACCESS , & origToken ))
974
975
{
975
- fprintf (stderr , "could not open process token: %lu\n" , GetLastError ());
976
+ fprintf (stderr , _ ("could not open process token: %lu\n" ),
977
+ GetLastError ());
976
978
exit_nicely (2 );
977
979
}
978
980
@@ -983,7 +985,7 @@ spawn_process(const char *cmdline)
983
985
!AllocateAndInitializeSid (& NtAuthority , 2 ,
984
986
SECURITY_BUILTIN_DOMAIN_RID , DOMAIN_ALIAS_RID_POWER_USERS , 0 , 0 , 0 , 0 , 0 , 0 , & dropSids [1 ].Sid ))
985
987
{
986
- fprintf (stderr , "could not allocate SIDs: %lu\n" , GetLastError ());
988
+ fprintf (stderr , _ ( "could not allocate SIDs: %lu\n" ) , GetLastError ());
987
989
exit_nicely (2 );
988
990
}
989
991
@@ -1002,7 +1004,8 @@ spawn_process(const char *cmdline)
1002
1004
1003
1005
if (!b )
1004
1006
{
1005
- fprintf (stderr , "could not create restricted token: %lu\n" , GetLastError ());
1007
+ fprintf (stderr , _ ("could not create restricted token: %lu\n" ),
1008
+ GetLastError ());
1006
1009
exit_nicely (2 );
1007
1010
}
1008
1011
@@ -2073,13 +2076,13 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
2073
2076
pg_conf = fopen (buf , "a" );
2074
2077
if (pg_conf == NULL )
2075
2078
{
2076
- fprintf (stderr , _ ("\n%s: could not open %s for adding extra config:\nError was %s\n" ), progname , buf , strerror (errno ));
2079
+ fprintf (stderr , _ ("\n%s: could not open \"%s\" for adding extra config: %s\n" ), progname , buf , strerror (errno ));
2077
2080
exit_nicely (2 );
2078
2081
}
2079
2082
extra_conf = fopen (temp_config , "r" );
2080
2083
if (extra_conf == NULL )
2081
2084
{
2082
- fprintf (stderr , _ ("\n%s: could not open %s to read extra config:\nError was %s\n" ), progname , temp_config , strerror (errno ));
2085
+ fprintf (stderr , _ ("\n%s: could not open \"%s\" to read extra config: %s\n" ), progname , temp_config , strerror (errno ));
2083
2086
exit_nicely (2 );
2084
2087
}
2085
2088
while (fgets (line_buf , sizeof (line_buf ), extra_conf ) != NULL )
0 commit comments