Commit bb44a7c5 authored by Bruce Momjian's avatar Bruce Momjian

pgindent files for Tom.

parent 83526ccf
......@@ -13,7 +13,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.82 2004/05/25 01:00:20 momjian Exp $
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.83 2004/05/27 15:07:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -50,6 +50,7 @@ int
main(int argc, char *argv[])
{
int len;
#ifndef WIN32
struct passwd *pw;
#endif
......@@ -100,11 +101,11 @@ main(int argc, char *argv[])
int err;
/* Make output streams unbuffered by default */
setvbuf(stdout,NULL,_IONBF,0);
setvbuf(stderr,NULL,_IONBF,0);
setvbuf(stdout, NULL, _IONBF, 0);
setvbuf(stderr, NULL, _IONBF, 0);
/* Prepare Winsock */
err = WSAStartup(MAKEWORD(2,2), &wsaData);
err = WSAStartup(MAKEWORD(2, 2), &wsaData);
if (err != 0)
{
fprintf(stderr, "%s: WSAStartup failed: %d\n",
......@@ -130,14 +131,14 @@ main(int argc, char *argv[])
/*
* Remember the physical location of the initially given argv[] array
* for possible use by ps display. On some platforms, the argv[]
* storage must be overwritten in order to set the process title for ps.
* In such cases save_ps_display_args makes and returns a new copy of
* the argv[] array.
* storage must be overwritten in order to set the process title for
* ps. In such cases save_ps_display_args makes and returns a new copy
* of the argv[] array.
*
* save_ps_display_args may also move the environment strings to make
* extra room. Therefore this should be done as early as possible during
* startup, to avoid entanglements with code that might save a getenv()
* result pointer.
* extra room. Therefore this should be done as early as possible
* during startup, to avoid entanglements with code that might save a
* getenv() result pointer.
*/
argv = save_ps_display_args(argc, argv);
......@@ -145,29 +146,30 @@ main(int argc, char *argv[])
* Set up locale information from environment. Note that LC_CTYPE and
* LC_COLLATE will be overridden later from pg_control if we are in an
* already-initialized database. We set them here so that they will
* be available to fill pg_control during initdb. LC_MESSAGES will get
* set later during GUC option processing, but we set it here to allow
* startup error messages to be localized.
* be available to fill pg_control during initdb. LC_MESSAGES will
* get set later during GUC option processing, but we set it here to
* allow startup error messages to be localized.
*/
set_pglocale(argv[0], "postgres");
#ifdef WIN32
/*
* Windows uses codepages rather than the environment, so we work around
* that by querying the environment explicitly first for LC_COLLATE
* and LC_CTYPE. We have to do this because initdb passes those values
* in the environment. If there is nothing there we fall back on the
* codepage.
* Windows uses codepages rather than the environment, so we work
* around that by querying the environment explicitly first for
* LC_COLLATE and LC_CTYPE. We have to do this because initdb passes
* those values in the environment. If there is nothing there we fall
* back on the codepage.
*/
if ((env_locale = getenv("LC_COLLATE")) != NULL)
setlocale(LC_COLLATE,env_locale);
setlocale(LC_COLLATE, env_locale);
else
setlocale(LC_COLLATE, "");
if ((env_locale = getenv("LC_CTYPE")) != NULL)
setlocale(LC_CTYPE,env_locale);
setlocale(LC_CTYPE, env_locale);
else
setlocale(LC_CTYPE, "");
#else
......@@ -241,8 +243,8 @@ main(int argc, char *argv[])
/*
* Now dispatch to one of PostmasterMain, PostgresMain, GucInfoMain,
* SubPostmasterMain, pgstat_main, pgstat_mainChild or BootstrapMain
* depending on the program name (and possibly first argument) we
* were called with. The lack of consistency here is historical.
* depending on the program name (and possibly first argument) we were
* called with. The lack of consistency here is historical.
*/
len = strlen(argv[0]);
......@@ -264,9 +266,11 @@ main(int argc, char *argv[])
exit(BootstrapMain(argc - 1, argv + 1));
#ifdef EXEC_BACKEND
/*
* If the first argument is "-forkexec", then invoke SubPostmasterMain. Note
* we remove "-forkexec" from the arguments passed on to SubPostmasterMain.
* If the first argument is "-forkexec", then invoke
* SubPostmasterMain. Note we remove "-forkexec" from the arguments
* passed on to SubPostmasterMain.
*/
if (argc > 1 && strcmp(argv[1], "-forkexec") == 0)
{
......@@ -279,7 +283,7 @@ main(int argc, char *argv[])
*/
if (argc > 1 && strcmp(argv[1], "-statBuf") == 0)
{
pgstat_main(argc , argv);
pgstat_main(argc, argv);
exit(0);
}
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment