diff -urNp nget-0.27.1.orig/auto_map.h nget-0.27.1/auto_map.h
--- nget-0.27.1.orig/auto_map.h 2004-06-18 02:30:33.000000000 +0530
+++ nget-0.27.1/auto_map.h 2008-02-16 21:55:45.000000000 +0530
@@ -23,10 +23,12 @@
#include <assert.h>
#include <map>
-template <class K, class T, template <class BK, class BT> class Base>
+template <class K, class T, template <class BK, class BT,
+ class _Compare=std::less<BK>,
+ class _Alloc=std::allocator<std::pair<const BK, BT> > > class Base>
class auto_map_base : public Base<K, restricted_ptr<T> > {
protected:
- typedef Base<K, restricted_ptr<T> > super;
+ typedef Base<K, restricted_ptr<T> > super;
public:
typedef typename super::iterator iterator;
diff -urNp nget-0.27.1.orig/dupe_file.cc nget-0.27.1/dupe_file.cc
--- nget-0.27.1.orig/dupe_file.cc 2004-05-30 04:30:05.000000000 +0530
+++ nget-0.27.1/dupe_file.cc 2008-02-16 21:55:45.000000000 +0530
@@ -24,7 +24,8 @@
#include <ctype.h>
#include <sys/stat.h>
#include <unistd.h>
-#include <errno.h>
+#include <cerrno>
+#include <cstring>
void dupe_file_checker::add(const char *filename, ulong size){
file_match *fm;
diff -urNp nget-0.27.1.orig/lite.h nget-0.27.1/lite.h
--- nget-0.27.1.orig/lite.h 2004-05-30 04:30:08.000000000 +0530
+++ nget-0.27.1/lite.h 2008-02-16 21:55:45.000000000 +0530
@@ -23,7 +23,8 @@
#include "config.h"
#endif
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstring>
char * newstrcpy(char *&dest, const char *src);
inline void safefree(char *&p){
if (p){free(p);p=NULL;}
diff -urNp nget-0.27.1.orig/myregex.cc nget-0.27.1/myregex.cc
--- nget-0.27.1.orig/myregex.cc 2004-05-30 04:30:06.000000000 +0530
+++ nget-0.27.1/myregex.cc 2008-02-16 21:55:45.000000000 +0530
@@ -19,7 +19,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstring>
#include "myregex.h"
diff -urNp nget-0.27.1.orig/nget.cc nget-0.27.1/nget.cc
--- nget-0.27.1.orig/nget.cc 2004-12-21 05:21:49.000000000 +0530
+++ nget-0.27.1/nget.cc 2008-02-16 23:31:38.000000000 +0530
@@ -143,50 +143,88 @@ static void addoption(char *longo,int ne
}
static void addoptions(void)
{
- addoption("quiet",0,'q',0,"supress extra info");
- addoption("host",1,'h',"HOSTALIAS","force nntp host to use (must be configured in .ngetrc)");
- addoption("available",0,'a',0,"update/load available newsgroups list");
- addoption("quickavailable",0,'A',0,"load available newsgroups list");
- addoption("xavailable",0,'X',0,"search available newsgroups list without using cache files");
- addoption("group",1,'g',"GROUP(s)","update and use newsgroups (comma seperated)");
- addoption("quickgroup",1,'G',"GROUP(s)","use group(s) without checking for new headers");
- addoption("xgroup",1,'x',"GROUP(s)","use group(s) without using cache files (requires XPAT)");
- addoption("flushserver",1,'F',"HOSTALIAS","flush server from current group(s) or newsgroup list");
- addoption("expretrieve",1,'R',"EXPRESSION","retrieve files matching expression(see man page)");
- addoption("retrieve",1,'r',"REGEX","retrieve files matching regex");
- addoption("list",1,'@',"LISTFILE","read commands from listfile");
- addoption("path",1,'p',"DIRECTORY","path to store subsequent retrieves");
- addoption("temppath",1,'P',"DIRECTORY","path to store tempfiles");
- addoption("dupepath",1,OPT_DUPEPATH,"DIRECTORY","extra path to check for dupe files");
- addoption("makedirs",1,'m',"no,yes,ask,#","make dirs specified by -p and -P");
+ addoption((char*) "quiet",0,'q',0,(char*) "supress extra info");
+ addoption((char*) "host",1,'h',(char*) "HOSTALIAS",
+ (char*) "force nntp host to use (must be configured in .ngetrc)");
+ addoption((char*) "available",0,'a',0,
+ (char*) "update/load available newsgroups list");
+ addoption((char*) "quickavailable",0,'A',0,
+ (char*) "load available newsgroups list");
+ addoption((char*) "xavailable",0,'X',0,
+ (char*) "search available newsgroups list without using cache files");
+ addoption((char*) "group",1,'g',(char*) "GROUP(s)",
+ (char*) "update and use newsgroups (comma seperated)");
+ addoption((char*) "quickgroup",1,'G',(char*) "GROUP(s)",
+ (char*) "use group(s) without checking for new headers");
+ addoption((char*) "xgroup",1,'x',(char*) "GROUP(s)",
+ (char*) "use group(s) without using cache files (requires XPAT)");
+ addoption((char*) "flushserver",1,'F',(char*) "HOSTALIAS",
+ (char*) "flush server from current group(s) or newsgroup list");
+ addoption((char*) "expretrieve",1,'R',(char*) "EXPRESSION",
+ (char*) "retrieve files matching expression(see man page)");
+ addoption((char*) "retrieve",1,'r',(char*) "REGEX",
+ (char*) "retrieve files matching regex");
+ addoption((char*) "list",1,'@',(char*) "LISTFILE",
+ (char*) "read commands from listfile");
+ addoption((char*) "path",1,'p',(char*) "DIRECTORY",
+ (char*) "path to store subsequent retrieves");
+ addoption((char*) "temppath",1,'P',(char*) "DIRECTORY",
+ (char*) "path to store tempfiles");
+ addoption((char*) "dupepath",1,OPT_DUPEPATH,(char*) "DIRECTORY",
+ (char*) "extra path to check for dupe files");
+ addoption((char*) "makedirs",1,'m',(char*) "no,yes,ask,#",
+ (char*) "make dirs specified by -p and -P");
// addoption("mark",1,'m',"MARKNAME","name of high water mark to test files against");
// addoption("testretrieve",1,'R',"REGEX","test what would have been retrieved");
- addoption("testmode",0,'T',0,"test what would have been retrieved");
- addoption("test-multiserver",1,OPT_TEST_MULTI,"OPT","make testmode display per-server completion info (no(default)/long/short)");
- addoption("fullxover",1,OPT_FULLXOVER,"OPT","override fullxover setting (-1..2, default -1)");
- addoption("text",1,OPT_TEXT_HANDLING,"OPT","how to handle text posts (files(default)/mbox[:filename]/ignore)");
- addoption("save-binary-info",1,OPT_SAVE_TEXT_FOR_BINARIES,"OPT","save text files for posts that contained only binaries (yes/no(default))");
- addoption("tries",1,'t',"INT","set max retries (-1 unlimits, default 20)");
- addoption("delay",1,'s',"INT","seconds to wait between retry attempts(default 1)");
- addoption("timeout",1,OPT_TIMEOUT,"INT","seconds to wait for data from server(default 180)");
- addoption("limit",1,'l',"INT","min # of lines a 'file' must have(default 0)");
- addoption("maxlines",1,'L',"INT","max # of lines a 'file' must have(default -1)");
- addoption("incomplete",0,'i',0,"retrieve files with missing parts");
- addoption("complete",0,'I',0,"retrieve only files with all parts(default)");
- addoption("decode",0,OPT_DECODE,0,"decode and delete temp files (default)");
- addoption("keep",0,'k',0,"decode, but keep temp files");
- addoption("no-decode",0,'K',0,"keep temp files and don't even try to decode them");
- addoption("case",0,'c',0,"match casesensitively");
- addoption("nocase",0,'C',0,"match incasesensitively(default)");
- addoption("dupecheck",1,'d',"FLAGS","check to make sure you haven't already downloaded files(default -dfiM)");
- addoption("nodupecheck",0,'D',0,"don't check if you already have files(shortcut for -dFIM)");
- addoption("autopar",0,OPT_AUTOPAR,0,"only download as many par files as needed (default)");
- addoption("no-autopar",0,OPT_NOAUTOPAR,0,"disable special par file handling");
- addoption("mark",0,'M',0,"mark matching articles as retrieved");
- addoption("unmark",0,'U',0,"mark matching articles as not retrieved (implies -dI)");
- addoption("writelite",1,'w',"LITEFILE","write out a ngetlite list file");
- addoption("noconnect",0,'N',0,"don't connect, only try to decode what we have");
- addoption("help",0,OPT_HELP,0,"this help");
+ addoption((char*) "testmode",0,'T',0,
+ (char*) "test what would have been retrieved");
+ addoption((char*) "test-multiserver",1,OPT_TEST_MULTI,(char*) "OPT",
+ (char*) "make testmode display per-server completion info (no(default)/long/short)");
+ addoption((char*) "fullxover",1,OPT_FULLXOVER,(char*) "OPT",
+ (char*) "override fullxover setting (-1..2, default -1)");
+ addoption((char*) "text",1,OPT_TEXT_HANDLING,(char*) "OPT",
+ (char*) "how to handle text posts (files(default)/mbox[:filename]/ignore)");
+ addoption((char*) "save-binary-info",1,OPT_SAVE_TEXT_FOR_BINARIES,
+ (char*) "OPT",
+ (char*) "save text files for posts that contained only binaries (yes/no(default))");
+ addoption((char*) "tries",1,'t',(char*) "INT",
+ (char*) "set max retries (-1 unlimits, default 20)");
+ addoption((char*) "delay",1,'s',(char*) "INT",
+ (char*) "seconds to wait between retry attempts(default 1)");
+ addoption((char*) "timeout",1,OPT_TIMEOUT,(char*) "INT",
+ (char*) "seconds to wait for data from server(default 180)");
+ addoption((char*) "limit",1,'l',(char*) "INT",
+ (char*) "min # of lines a 'file' must have(default 0)");
+ addoption((char*) "maxlines",1,'L',(char*) "INT",
+ (char*) "max # of lines a 'file' must have(default -1)");
+ addoption((char*) "incomplete",0,'i',0,
+ (char*) "retrieve files with missing parts");
+ addoption((char*) "complete",0,'I',0,(char*) "retrieve only files with all parts(default)");
+ addoption((char*) "decode",0,OPT_DECODE,0,(char*) "decode and delete temp files (default)");
+ addoption((char*) "keep",0,'k',0,
+ (char*) "decode, but keep temp files");
+ addoption((char*) "no-decode",0,'K',0,
+ (char*) "keep temp files and don't even try to decode them");
+ addoption((char*) "case",0,'c',0,(char*) "match casesensitively");
+ addoption((char*) "nocase",0,'C',0,
+ (char*) "match incasesensitively(default)");
+ addoption((char*) "dupecheck",1,'d',(char*) "FLAGS",
+ (char*) "check to make sure you haven't already downloaded files(default -dfiM)");
+ addoption((char*) "nodupecheck",0,'D',0,
+ (char*) "don't check if you already have files(shortcut for -dFIM)");
+ addoption((char*) "autopar",0,OPT_AUTOPAR,0,
+ (char*) "only download as many par files as needed (default)");
+ addoption((char*) "no-autopar",0,OPT_NOAUTOPAR,0,
+ (char*) "disable special par file handling");
+ addoption((char*) "mark",0,'M',0,
+ (char*) "mark matching articles as retrieved");
+ addoption((char*) "unmark",0,'U',0,
+ (char*) "mark matching articles as not retrieved (implies -dI)");
+ addoption((char*) "writelite",1,'w',(char*) "LITEFILE",
+ (char*) "write out a ngetlite list file");
+ addoption((char*) "noconnect",0,'N',0,
+ (char*) "don't connect, only try to decode what we have");
+ addoption((char*) "help",0,OPT_HELP,0,(char*) "this help");
addoption(NULL,0,0,NULL,NULL);
};
static void print_help(void){
diff -urNp nget-0.27.1.orig/nrange.h nget-0.27.1/nrange.h
--- nget-0.27.1.orig/nrange.h 2004-05-30 04:30:08.000000000 +0530
+++ nget-0.27.1/nrange.h 2008-02-16 21:55:45.000000000 +0530
@@ -22,6 +22,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include <climits>
#include <sys/types.h>
#include <map>
#include <stdexcept>
diff -urNp nget-0.27.1.orig/path.cc nget-0.27.1/path.cc
--- nget-0.27.1.orig/path.cc 2004-05-30 04:30:06.000000000 +0530
+++ nget-0.27.1/path.cc 2008-02-16 21:55:45.000000000 +0530
@@ -17,7 +17,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "path.h"
-#include <errno.h>
+#include <cerrno>
+#include <cstring>
#include <unistd.h>
#include "log.h"
#include "_fileconf.h"
diff -urNp nget-0.27.1.orig/server.cc nget-0.27.1/server.cc
--- nget-0.27.1.orig/server.cc 2004-12-21 02:14:11.000000000 +0530
+++ nget-0.27.1/server.cc 2008-02-16 22:09:43.000000000 +0530
@@ -20,6 +20,7 @@
#include "strreps.h"
#include "nget.h"
#include "status.h"
+#include <climits>
#include <sys/types.h>
#include <dirent.h>
#include <algorithm>
diff -urNp nget-0.27.1.orig/stlhelp.h nget-0.27.1/stlhelp.h
--- nget-0.27.1.orig/stlhelp.h 2004-05-30 04:30:08.000000000 +0530
+++ nget-0.27.1/stlhelp.h 2008-02-16 21:55:45.000000000 +0530
@@ -19,6 +19,7 @@
#ifndef _STLHELP_H_
#define _STLHELP_H_
+#include <cstring>
struct eqstr
{
bool operator()(const char* s1, const char* s2) const
