Add missing gettext() calls in find_my_exec(). It's probably too late

tglsfdc · tglsfdc · commit 982e99806495 · 2005-01-14T17:47:49.000Z
to get these strings translated, but we may as well have them be
translatable as not.
diff --git a/src/port/exec.c b/src/port/exec.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/exec.c,v 1.36 2004/12/31 22:03:53 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/port/exec.c,v 1.37 2005/01/14 17:47:49 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,6 +42,7 @@
 
 #ifndef FRONTEND
 /* We use only 3-parameter elog calls in this file, for simplicity */
+/* NOTE: caller must provide gettext call around str! */
 #define log_error(str, param)	elog(LOG, str, param)
 #else
 #define log_error(str, param)	(fprintf(stderr, str, param), fputc('\n', stderr))
@@ -209,7 +210,7 @@ find_my_exec(const char *argv0, char *retpath)
 		if (validate_exec(retpath) == 0)
 			return resolve_symlinks(retpath);
 
-		log_error("invalid binary \"%s\"", retpath);
+		log_error(gettext("invalid binary \"%s\""), retpath);
 		return -1;
 	}
 
@@ -258,13 +259,14 @@ find_my_exec(const char *argv0, char *retpath)
 				case -1:		/* wasn't even a candidate, keep looking */
 					break;
 				case -2:		/* found but disqualified */
-					log_error("could not read binary \"%s\"", retpath);
+					log_error(gettext("could not read binary \"%s\""),
+							  retpath);
 					break;
 			}
 		} while (*endp);
 	}
 
-	log_error("could not find a \"%s\" to execute", argv0);
+	log_error(gettext("could not find a \"%s\" to execute"), argv0);
 	return -1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/port/exec.c,v 1.36 2004/12/31 22:03:53 pgsql Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/port/exec.c,v 1.37 2005/01/14 17:47:49 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -42,6 +42,7 @@`
`42`	`42`
`43`	`43`	`#ifndef FRONTEND`
`44`	`44`	`/* We use only 3-parameter elog calls in this file, for simplicity */`
	`45`	`+/* NOTE: caller must provide gettext call around str! */`
`45`	`46`	`#define log_error(str, param) elog(LOG, str, param)`
`46`	`47`	`#else`
`47`	`48`	`#define log_error(str, param) (fprintf(stderr, str, param), fputc('\n', stderr))`
`@@ -209,7 +210,7 @@ find_my_exec(const char argv0, char retpath)`
`209`	`210`	`if (validate_exec(retpath) == 0)`
`210`	`211`	`return resolve_symlinks(retpath);`
`211`	`212`
`212`		`- log_error("invalid binary \"%s\"", retpath);`
	`213`	`+ log_error(gettext("invalid binary \"%s\""), retpath);`
`213`	`214`	`return -1;`
`214`	`215`	`}`
`215`	`216`
`@@ -258,13 +259,14 @@ find_my_exec(const char argv0, char retpath)`
`258`	`259`	`case -1: /* wasn't even a candidate, keep looking */`
`259`	`260`	`break;`
`260`	`261`	`case -2: /* found but disqualified */`
`261`		`- log_error("could not read binary \"%s\"", retpath);`
	`262`	`+ log_error(gettext("could not read binary \"%s\""),`
	`263`	`+ retpath);`
`262`	`264`	`break;`
`263`	`265`	`}`
`264`	`266`	`} while (*endp);`
`265`	`267`	`}`
`266`	`268`
`267`		`- log_error("could not find a \"%s\" to execute", argv0);`
	`269`	`+ log_error(gettext("could not find a \"%s\" to execute"), argv0);`
`268`	`270`	`return -1;`
`269`	`271`	`}`
`270`	`272`