From 4c8eb3654574fac053616af7aa18603fade0ad28 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sun, 13 Jan 2008 22:26:23 +0000 Subject: [PATCH] Added some graphics libraries, handled a few requests, fixed bus error on apt close, got links compiling with the right compiler, and switched JamVM back to its internal libffi. M port.diff git-svn-id: http://svn.telesphoreo.org/trunk@13 514c082c-b64e-11dc-b46d-3d985efe055d --- cmdline/apt-cache.cc | 6 +----- cmdline/apt-cdrom.cc | 6 +----- cmdline/apt-config.cc | 6 +----- cmdline/apt-extracttemplates.cc | 6 +----- cmdline/apt-get.cc | 9 +++------ cmdline/apt-sortpkgs.cc | 6 +----- methods/cdrom.cc | 6 +----- methods/copy.cc | 6 +----- methods/file.cc | 6 +----- methods/ftp.cc | 6 +----- methods/gpgv.cc | 6 +----- methods/gzip.cc | 6 +----- methods/http.cc | 6 +----- methods/rred.cc | 6 +----- methods/rsh.cc | 6 +----- 15 files changed, 17 insertions(+), 76 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index b2d210a..b05d6b9 100644 --- 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 1585694..3e5a1a7 100644 --- 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 716d2e3..58d945e 100644 --- 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 fa102b5..a931b41 100644 --- 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 8628dbc..7cae6e1 100644 --- 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 1d04f0a..c2b4f90 100644 --- 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 d1ae320..d6b8eae 100644 --- 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 85f7e30..d737e3c 100644 --- 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 d78b6a9..9cdd5bc 100644 --- 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 383e426..0c2aa00 100644 --- 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 46c8a24..227e08d 100644 --- 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 9f87e71..f732c0b 100644 --- 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 ff680f3..1f3b038 100644 --- 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 37932c3..6fa57f3 100644 --- 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 73674f5..f0ccfc4 100644 --- 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, ""); -- 2.47.2