From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 8 May 2008 20:45:42 +0000 (-0600)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~45^2~11^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edd6479bca71ac7cff38d03dd6159a0ca105b9ff;p=thirdparty%2Fsquid.git

Merge from trunk
---

edd6479bca71ac7cff38d03dd6159a0ca105b9ff
diff --cc src/Makefile.am
index c737da8846,56b7071b05..9131f2aca0
mode 100644,100755..100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
diff --cc src/main.cc
index 73543e97be,006a9e6e98..28693e0183
--- a/src/main.cc
+++ b/src/main.cc
@@@ -1152,30 -1150,7 +1153,29 @@@ extern "C" void WINAP
  int
  main(int argc, char **argv)
  #endif
 +{
 +    SquidMainSafe(argc, argv);
 +}
 +
 +static int
 +SquidMainSafe(int argc, char **argv)
 +{
 +    try {
 +        return SquidMain(argc, argv);
 +	}
 +    catch (const TextException &e) {
 +		// XXX: add TextException::print
 +        std::cerr << "dying from unhandled exception: " << e.message << std::endl;
 +	}
 +    catch (...) {
 +        std::cerr << "dying from unhandled exception." << std::endl;
 +	}
 +	return -1;
 +}
 +
 +static int
 +SquidMain(int argc, char **argv)
  {
-     mode_t oldmask;
  #ifdef _SQUID_WIN32_
  
      int WIN32_init_err;