use std::locale::global instead of setlocale

We use a wild mixture of C and C++ ways of generating output, so having
a consistent world-view in both styles sounds like a good idea and
should help in preventing regressions.

diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc
index 9eb306834c5de2d616b4329a6da3e512b9710e0b..0a9f4713fcd8c9b1fafd845440a13eef0e46259c 100644 (file)
--- a/apt-private/private-main.cc
+++ b/apt-private/private-main.cc
@@ -7,6 +7,8 @@
 #include <apt-private/private-main.h>
 
 #include <iostream>
 #include <apt-private/private-main.h>
 
 #include <iostream>

+#include <locale>
+

 #include <string.h>
 #include <unistd.h>
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
 #include <signal.h>


@@ -16,7 +18,7 @@
 
 void InitLocale()                                                      /*{{{*/
 {
 
 void InitLocale()                                                      /*{{{*/
 {

-   setlocale(LC_ALL,"");
+   std::locale::global(std::locale(""));

    textdomain(PACKAGE);
 }
                                                                        /*}}}*/
    textdomain(PACKAGE);
 }
                                                                        /*}}}*/

diff --git a/methods/aptmethod.h b/methods/aptmethod.h
index f8a68c92bae34218b651ef7b49c7ee55e4a3a789..cf3496e4547c2ada2b2f990f23ecd0296eadf3b0 100644 (file)
--- a/methods/aptmethod.h
+++ b/methods/aptmethod.h
@@ -4,6 +4,7 @@
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/configuration.h>
 
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/configuration.h>
 

+#include <locale>

 #include <string>
 
 class aptMethod : public pkgAcqMethod
 #include <string>
 
 class aptMethod : public pkgAcqMethod


@@ -44,7 +45,9 @@ public:
 
    aptMethod(char const * const Binary, char const * const Ver, unsigned long const Flags) :
       pkgAcqMethod(Ver, Flags), Binary(Binary)
 
    aptMethod(char const * const Binary, char const * const Ver, unsigned long const Flags) :
       pkgAcqMethod(Ver, Flags), Binary(Binary)

-   {}
+   {
+      std::locale::global(std::locale(""));
+   }

 };
 
 #endif
 };
 
 #endif

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index d9ddecb6a1aadca2f4a1ce0f3ff96215599c19e6..161822ac6e0062cb46b1ca99285c96132a6fe267 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -10,7 +10,6 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
 // Include Files                                                       /*{{{*/
 #include <config.h>
 

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>


@@ -19,6 +18,8 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 

+#include "aptmethod.h"
+

 #include <string>
 #include <vector>
 #include <sys/stat.h>
 #include <string>
 #include <vector>
 #include <sys/stat.h>


@@ -29,7 +30,7 @@
 
 using namespace std;
 
 
 using namespace std;
 

-class CDROMMethod : public pkgAcqMethod
+class CDROMMethod : public aptMethod

 {
    bool DatabaseLoaded;
    bool Debug;
 {
    bool DatabaseLoaded;
    bool Debug;


@@ -54,9 +55,9 @@ class CDROMMethod : public pkgAcqMethod
 // CDROMMethod::CDROMethod - Constructor                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CDROMMethod::CDROMethod - Constructor                               /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
+CDROMMethod::CDROMMethod() : aptMethod("cdrom", "1.0",SingleInstance | LocalOnly |

                                          SendConfig | NeedsCleanup |
                                          SendConfig | NeedsCleanup |

-                                         Removable), 
+                                         Removable),

                                           DatabaseLoaded(false),
                                          Debug(false),
                                           MountedByApt(false)
                                           DatabaseLoaded(false),
                                          Debug(false),
                                           MountedByApt(false)


@@ -279,8 +280,6 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   CDROMMethod Mth;
-   return Mth.Run();
+   _config->CndSet("Binary::cdrom::Debug::NoDropPrivs", true);
+   return CDROMMethod().Run();

 }
 }

diff --git a/methods/copy.cc b/methods/copy.cc
index e515b2def10e1eed04abd89709915703470ec684..5e36543897eb244637ad86c2d114d1902db5894d 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -13,7 +13,6 @@
 
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>


@@ -95,9 +94,5 @@ bool CopyMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   CopyMethod Mth;
-
-   return Mth.Run();
+   return CopyMethod().Run();

 }
 }

diff --git a/methods/file.cc b/methods/file.cc
index 36f3c39b9b8c2a9fef1fc25893e994f43263d0e6..5cbf1924ed37a188062a632ab7433b5289025005 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -15,7 +15,6 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
 // Include Files                                                       /*{{{*/
 #include <config.h>
 

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>


@@ -129,8 +128,5 @@ bool FileMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   FileMethod Mth;
-   return Mth.Run();
+   return FileMethod().Run();

 }
 }

diff --git a/methods/ftp.cc b/methods/ftp.cc
index a8bc95938f5c47ad2341de40f809a50c1ff8dd34..6a886dd19e0229f54bcf03675e6b9c869f22e79c 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -18,7 +18,6 @@
 #include <config.h>
 
 #include <apt-pkg/fileutl.h>
 #include <config.h>
 
 #include <apt-pkg/fileutl.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>


@@ -1115,9 +1114,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
                                                                        /*}}}*/
 
 int main(int, const char *argv[])
                                                                        /*}}}*/
 
 int main(int, const char *argv[])

-{ 
-   setlocale(LC_ALL, "");
-
+{

    /* See if we should be come the http client - we do this for http
       proxy urls */
    if (getenv("ftp_proxy") != 0)
    /* See if we should be come the http client - we do this for http
       proxy urls */
    if (getenv("ftp_proxy") != 0)


@@ -1140,8 +1137,5 @@ int main(int, const char *argv[])
         exit(100);
       }      
    }
         exit(100);
       }      
    }

-   
-   FtpMethod Mth;
-
-   return Mth.Run();
+   return FtpMethod().Run();

 }
 }

diff --git a/methods/ftp.h b/methods/ftp.h
index de2c232bd41db0efd18e02c9fa29a0aad7b1f30c..6a12475a08a952e5c206163b118c6cd55bf57b3e 100644 (file)
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -10,7 +10,6 @@
 #ifndef APT_FTP_H
 #define APT_FTP_H
 
 #ifndef APT_FTP_H
 #define APT_FTP_H
 

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/strutl.h>
 #include "aptmethod.h"
 
 #include <apt-pkg/strutl.h>
 #include "aptmethod.h"
 

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index dd395d6598c8fb34d3327b0307810e9ac68b7c57..fc6eb91593deab2db2bf3806189f1cc914a581fb 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,6 +1,5 @@
 #include <config.h>
 
 #include <config.h>
 

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/gpgv.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/gpgv.h>


@@ -427,9 +426,5 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   GPGVMethod Mth;
-
-   return Mth.Run();
+   return GPGVMethod().Run();

 }
 }

diff --git a/methods/http.cc b/methods/http.cc
index 0c3803fbb3979d1635bc9478f2343d7e19fdfb59..b861e61ee9ea737e727efd4a6094550aaead4235 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -28,7 +28,6 @@
 #include <config.h>
 
 #include <apt-pkg/fileutl.h>
 #include <config.h>
 
 #include <apt-pkg/fileutl.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>

diff --git a/methods/http.h b/methods/http.h
index 9e2b1da5caf3de0e56c0a7f6fa2c421b1421ab6c..5567de715d1abc17d75fac06736679dfeb43444a 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -12,7 +12,6 @@
 #define APT_HTTP_H
 
 #include <apt-pkg/strutl.h>
 #define APT_HTTP_H
 
 #include <apt-pkg/strutl.h>

-#include <apt-pkg/acquire-method.h>

 
 #include <string>
 #include <sys/time.h>
 
 #include <string>
 #include <sys/time.h>

diff --git a/methods/http_main.cc b/methods/http_main.cc
index cd52c42e83407bd22dc217720c0ca66970cbe06a..fa183ddb3ce7119f5b57181886dfcaf28fb4ed48 100644 (file)
--- a/methods/http_main.cc
+++ b/methods/http_main.cc
@@ -7,13 +7,9 @@
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-

    // ignore SIGPIPE, this can happen on write() if the socket
    // closes the connection (this is dealt with via ServerDie())
    signal(SIGPIPE, SIG_IGN);
 
    // ignore SIGPIPE, this can happen on write() if the socket
    // closes the connection (this is dealt with via ServerDie())
    signal(SIGPIPE, SIG_IGN);
 

-   HttpMethod Mth;
-
-   return Mth.Loop();
+   return HttpMethod().Loop();

 }
 }

diff --git a/methods/https.cc b/methods/https.cc
index fc439bef85fe2ea47324531ed4eb36b44ff851e5..35992ee966c227767de31b0e7394284d82778a8c 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -13,7 +13,6 @@
 #include <config.h>
 
 #include <apt-pkg/fileutl.h>
 #include <config.h>
 
 #include <apt-pkg/fileutl.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>


@@ -528,11 +527,6 @@ std::unique_ptr<ServerState> HttpsMethod::CreateServerState(URI const &uri)/*{{{
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   HttpsMethod Mth;
-   curl_global_init(CURL_GLOBAL_SSL) ;
-
-   return Mth.Run();
+   return HttpsMethod().Run();

 }
 
 }
 

diff --git a/methods/https.h b/methods/https.h
index 4d50c5a040cdd1f62508c781876333f71f009446..74b86a24f8016c72ce4e00b87cff8003b3e62b2a 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -11,8 +11,6 @@
 #ifndef APT_HTTPS_H
 #define APT_HTTPS_H
 
 #ifndef APT_HTTPS_H
 #define APT_HTTPS_H
 

-#include <apt-pkg/acquire-method.h>
-

 #include <curl/curl.h>
 #include <iostream>
 #include <stddef.h>
 #include <curl/curl.h>
 #include <iostream>
 #include <stddef.h>


@@ -82,6 +80,7 @@ class HttpsMethod : public ServerMethod
 
    HttpsMethod() : ServerMethod("https","1.2",Pipeline | SendConfig)
    {
 
    HttpsMethod() : ServerMethod("https","1.2",Pipeline | SendConfig)
    {

+      curl_global_init(CURL_GLOBAL_SSL);

       curl = curl_easy_init();
    };
 
       curl = curl_easy_init();
    };
 

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 01eed09f0fe2999846a662341305cb52ea011a8b..9d900771be8255c1b926e604727646307c1aca84 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -12,7 +12,6 @@
 
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>
 
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/error.h>


@@ -465,11 +464,7 @@ void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   MirrorMethod Mth;
-
-   return Mth.Loop();
+   return MirrorMethod().Loop();

 }
 
 
 }
 
 

diff --git a/methods/mirror.h b/methods/mirror.h
index 425bea6735a72cbd282c42f40220aff7227903dd..6ebe08e6b6f179afbba1eb25524e46ab2cc40977 100644 (file)
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-

-// Description                                                         /*{{{*/// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
-// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
+// Description                                                         /*{{{*/

 /* ######################################################################
 
    MIRROR Acquire Method - This is the MIRROR acquire method for APT.
 /* ######################################################################
 
    MIRROR Acquire Method - This is the MIRROR acquire method for APT.


@@ -11,8 +10,6 @@
 #ifndef APT_MIRROR_H
 #define APT_MIRROR_H
 
 #ifndef APT_MIRROR_H
 #define APT_MIRROR_H
 

-#include <apt-pkg/acquire-method.h>
-

 #include <iostream>
 #include <string>
 #include <vector>
 #include <iostream>
 #include <string>
 #include <vector>

diff --git a/methods/rred.cc b/methods/rred.cc
index 79ab8cb5282f00e6d94bbaf176793db0c555a70e..51af3755784567aa84d47428b1f713d7ac384a81 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -10,7 +10,6 @@
 #include <apt-pkg/init.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>


@@ -704,8 +703,7 @@ int main(int argc, char **argv)
    Patch patch;
 
    if (argc <= 1) {
    Patch patch;
 
    if (argc <= 1) {

-      RredMethod Mth;
-      return Mth.Run();
+      return RredMethod().Run();

    }
 
    // Usage: rred -t input output diff ...
    }
 
    // Usage: rred -t input output diff ...

diff --git a/methods/rsh.cc b/methods/rsh.cc
index 4d133951f0bd85d8b2e1ffad5544cc76c29b1e2f..74a908ef7f2647e3668e8af6203270fc4c3025f8 100644 (file)
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -17,7 +17,6 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/strutl.h>
 
 #include <stdlib.h>
 #include <apt-pkg/strutl.h>
 
 #include <stdlib.h>


@@ -547,8 +546,5 @@ bool RSHMethod::Fetch(FetchItem *Itm)
 
 int main(int, const char *argv[])
 {
 
 int main(int, const char *argv[])
 {

-   setlocale(LC_ALL, "");
-
-   RSHMethod Mth(flNotDir(argv[0]));
-   return Mth.Run();
+   return RSHMethod(flNotDir(argv[0])).Run();

 }
 }

diff --git a/methods/rsh.h b/methods/rsh.h
index 64a5cf66190c756a652ec0fe9c8214d668c76813..571e38ba64baba53a062987b1f0fb1f9facf0081 100644 (file)
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -54,7 +54,6 @@ class RSHConn
    ~RSHConn();
 };
 
    ~RSHConn();
 };
 

-#include <apt-pkg/acquire-method.h>

 #include "aptmethod.h"
 
 class RSHMethod : public aptMethod
 #include "aptmethod.h"
 
 class RSHMethod : public aptMethod

diff --git a/methods/server.cc b/methods/server.cc
index d606f26aa0408fb38ed52420eee19fbdd8d66f8d..9db45eb8cbe038288f1909a7fb4cecb28cae8f86 100644 (file)
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -10,7 +10,6 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
 // Include Files                                                       /*{{{*/
 #include <config.h>
 

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>

diff --git a/methods/server.h b/methods/server.h
index 3f6502432e5b11789913948cd37d93d8a3ccc32c..1f90f6bd4789364c5c3dac8fe75c11f14634f1d6 100644 (file)
--- a/methods/server.h
+++ b/methods/server.h
@@ -12,7 +12,6 @@
 #define APT_SERVER_H
 
 #include <apt-pkg/strutl.h>
 #define APT_SERVER_H
 
 #include <apt-pkg/strutl.h>

-#include <apt-pkg/acquire-method.h>

 #include "aptmethod.h"
 
 #include <time.h>
 #include "aptmethod.h"
 
 #include <time.h>

diff --git a/methods/store.cc b/methods/store.cc
index 2ad0f0177675a6ac50e4ee8a7d2dbecdbfac3a86..934e1a188bcb751c47a702687d0b5be118f0eca3 100644 (file)
--- a/methods/store.cc
+++ b/methods/store.cc
@@ -14,7 +14,6 @@
 #include <config.h>
 
 #include <apt-pkg/configuration.h>
 #include <config.h>
 
 #include <apt-pkg/configuration.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>


@@ -152,8 +151,5 @@ bool StoreMethod::Fetch(FetchItem *Itm)                                     /*{{{*/
 
 int main(int, char *argv[])
 {
 
 int main(int, char *argv[])
 {

-   setlocale(LC_ALL, "");
-
-   StoreMethod Mth(flNotDir(argv[0]));
-   return Mth.Run();
+   return StoreMethod(flNotDir(argv[0])).Run();

 }
 }