Added some graphics libraries, handled a few requests, fixed bus error on apt close...

M port.diff

git-svn-id: http://svn.telesphoreo.org/trunk@13 514c082c-b64e-11dc-b46d-3d985efe055d

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index b2d210a9709155e4c5d918d1cd8af35484a33cdb..b05d6b98d982e96e2319d6f123fa307a03d49886 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1704,11 +1704,7 @@ void CacheInitialize()
 }
                                                                        /*}}}*/
 
-int main_(int argc,const char *argv[]);
-int main(int argc,const char *argv[]) {
-    _exit(main_(argc, argv));
-}
-int main_(int argc,const char *argv[])
+int main(int argc,const char *argv[])
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 1585694dae001d95449b8a52c10ea9f53b9f0b98..3e5a1a7eee99a64c579171653da1c7a48c5a4fbd 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -165,11 +165,7 @@ int ShowHelp()
 }
                                                                        /*}}}*/
 
-int main_(int argc,const char *argv[]);
-int main(int argc,const char *argv[]) {
-    _exit(main_(argc, argv));
-}
-int main_(int argc,const char *argv[])
+int main(int argc,const char *argv[])
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 716d2e3bc0b27504317f7de97d8e5d04bbb5c7cb..58d945efa88b178a3dd944538a141db6328a89d8 100644 (file)
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -89,11 +89,7 @@ int ShowHelp()
 }
                                                                        /*}}}*/
 
-int main_(int argc,const char *argv[]);
-int main(int argc,const char *argv[]) {
-    _exit(main_(argc, argv));
-}
-int main_(int argc,const char *argv[])
+int main(int argc,const char *argv[])
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index fa102b5e9a0b9440ef1aae578554d0a22c6b8647..a931b415fc1d275c871c31a5609469552da14d39 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -349,11 +349,7 @@ bool Go(CommandLine &CmdL)
 }
                                                                        /*}}}*/
 
-int main_(int argc,const char *argv[]);
-int main(int argc,const char *argv[]) {
-    _exit(main_(argc, argv));
-}
-int main_(int argc,const char *argv[])
+int main(int argc, const char **argv)
 {
        CommandLine::Args Args[] = {
                {'h',"help","help",0},

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 8628dbc726181924cb5491df1dfa0fd235e9470a..7cae6e18bc856a9e333b389a5946b65e33f8d86f 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2502,11 +2502,7 @@ void SigWinch(int)
 }
                                                                        /*}}}*/
 
-int main_(int argc,const char *argv[]);
-int main(int argc,const char *argv[]) {
-    _exit(main_(argc, argv));
-}
-int main_(int argc,const char *argv[])
+int main(int argc,const char *argv[])
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
@@ -2593,7 +2589,8 @@ int main_(int argc,const char *argv[])
    if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
       _config->Set("quiet","1");
 
-   ofstream devnull("/dev/null");
+   ofstream devnull;
+   devnull.open("/dev/null");
 
    // Setup the output streams
    c0out.rdbuf(cout.rdbuf());

diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 1d04f0ac4008ff773462fe8b4022e0f2963704d1..c2b4f90db8ec9213ff6a0ac39d3df5ed27cb891e 100644 (file)
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -162,11 +162,7 @@ int ShowHelp()
 }
                                                                        /*}}}*/
 
-int main_(int argc,const char *argv[]);
-int main(int argc,const char *argv[]) {
-    _exit(main_(argc, argv));
-}
-int main_(int argc,const char *argv[])
+int main(unsigned int argc,const char *argv[])
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index d1ae3203a78d7bbfea6bc929383cd3110764e61b..d6b8eae75c0dd4d6c810f0ab720b997c09dfdb76 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -191,11 +191,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 }
                                                                        /*}}}*/
 
-int main_();
-int main() {
-    _exit(main_());
-}
-int main_()
+int main()
 {
    setlocale(LC_ALL, "");
 

diff --git a/methods/copy.cc b/methods/copy.cc
index 85f7e30b598c94b7b20a230090a234a051be1fb2..d737e3c33cb851b646d726c24f00fad053098cce 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -84,11 +84,7 @@ bool CopyMethod::Fetch(FetchItem *Itm)
 }
                                                                        /*}}}*/
 
-int main_();
-int main() {
-    _exit(main_());
-}
-int main_()
+int main()
 {
    setlocale(LC_ALL, "");
 

diff --git a/methods/file.cc b/methods/file.cc
index d78b6a9ac16988fee82e2df96a7ed0f450a7d4ed..9cdd5bc2d3b3a3ea9ff14f2732ef832780e146cd 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -87,11 +87,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
 }
                                                                        /*}}}*/
 
-int main_();
-int main() {
-_exit(main_());
-}
-int main_()
+int main()
 {
    setlocale(LC_ALL, "");
 

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 383e426c415910a046d5ce620b42c95f5bfb3d05..0c2aa00a76a599fc5c0dea110862db30b3fd5d08 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1084,11 +1084,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
 }
                                                                        /*}}}*/
 
-int main_(int argc, const char *argv[]);
-int main(int argc, const char *argv[]) {
-    _exit(main_(argc, argv));
-}
-int main_(int argc, const char *argv[])
+int main(int argc,const char *argv[])
 { 
    setlocale(LC_ALL, "");
 

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 46c8a249dd0a35cf5f0332a6bae8663649de7a45..227e08d63123e2c51ba77966dc218e41f13f217c 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -300,11 +300,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
 }
 
 
-int main_();
-int main() {
-_exit(main_());
-}
-int main_()
+int main()
 {
    setlocale(LC_ALL, "");
    

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 9f87e71c4b885c14f1fcb39cd8fdf39a5154af1e..f732c0b8600f227bd98e0fb088038aea4383e8c8 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -160,11 +160,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 }
                                                                        /*}}}*/
 
-int main_(int argc, const char *argv[]);
-int main(int argc, const char *argv[]) {
-    _exit(main_(argc, argv));
-}
-int main_(int argc, const char *argv[])
+int main(int argc, char *argv[])
 {
    setlocale(LC_ALL, "");
 

diff --git a/methods/http.cc b/methods/http.cc
index ff680f3123bf26677bdc9e372b01da1e24a1363c..1f3b038bc4a515391ff0feb8ac3ca326733cee1b 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1222,11 +1222,7 @@ int HttpMethod::Loop()
 }
                                                                        /*}}}*/
 
-int main_();
-int main() {
-_exit(main_());
-}
-int main_()
+int main()
 {
    setlocale(LC_ALL, "");
 

diff --git a/methods/rred.cc b/methods/rred.cc
index 37932c391a86288b3905d60a3074b02b1c25cc91..6fa57f3a60f58263da407f706ca31f9601a2aba3 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -251,11 +251,7 @@ bool RredMethod::Fetch(FetchItem *Itm)
    return true;
 }
 
-int main_(int argc, const char *argv[]);
-int main(int argc, const char *argv[]) {
-_exit(main_(argc, argv));
-}
-int main_(int argc,const  char *argv[])
+int main(int argc, char *argv[])
 {
    RredMethod Mth;
 

diff --git a/methods/rsh.cc b/methods/rsh.cc
index 73674f5bf8f94d1981c872236c44c208cff82bf4..f0ccfc42d2890513c0b5048943915da75afcc184 100644 (file)
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -509,11 +509,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
 }
                                                                        /*}}}*/
 
-int main_(int argc, const char *argv[]);
-int main(int argc, const char *argv[]) {
-_exit(main_(argc, argv));
-}
-int main_(int argc,const  char *argv[])
+int main(int argc, const char *argv[])
 {
    setlocale(LC_ALL, "");