← Back to branch summary

~ubuntu-branches/ubuntu/wily/haproxy/wily

« back to all changes in this revision

Viewing changes to src/haproxy.c

  • Committer: Bazaar Package Importer
  • Author(s): Arnaud Cornet
  • Date: 2009-02-17 08:55:12 UTC
  • mfrom: (1.1.5 upstream) (2.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090217085512-qmij51nun3rbxorz
http://bugs.debian.org/515682
Fix build without debian/patches directory (Closes: #515682) using
/usr/share/quilt/quilt.make.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/haproxy.c
397
397
        char *tmp;
398
398
        char *cfg_pidfile = NULL;
399
399
 
400
 
        if (1<<INTBITS != sizeof(int)*8) {
401
 
                fprintf(stderr,
402
 
                        "Error: wrong architecture. Recompile so that sizeof(int)=%d\n",
403
 
                        (int)(sizeof(int)*8));
404
 
                exit(1);
405
 
        }
406
 
 
407
400
        /*
408
401
         * Initialize the previously static variables.
409
402
         */
902
895
        signal(SIGTTOU, sig_pause);
903
896
        signal(SIGTTIN, sig_listen);
904
897
 
905
 
        if (global.mode & MODE_DAEMON) {
906
 
                global.mode &= ~MODE_VERBOSE;
907
 
                global.mode |= MODE_QUIET;
908
 
        }
909
 
 
910
898
        /* MODE_QUIET can inhibit alerts and warnings below this line */
911
899
 
912
900
        global.mode &= ~MODE_STARTING;
1068
1056
                 * it would have already be done, and 0-2 would have been affected to listening
1069
1057
                 * sockets
1070
1058
                 */
1071
 
                if (!(global.mode & MODE_QUIET)) {
 
1059
                if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) {
1072
1060
                        /* detach from the tty */
1073
1061
                        fclose(stdin); fclose(stdout); fclose(stderr);
1074
1062
                        close(0); close(1); close(2); /* close all fd's */
 
1063
                        global.mode &= ~MODE_VERBOSE;
1075
1064
                        global.mode |= MODE_QUIET; /* ensure that we won't say anything from now */
1076
1065
                }
1077
1066
                pid = getpid(); /* update child's pid */