@@ -1,3 +1,7 @@

+Fri Apr 29 03:19:44 CEST 2005 (tk)

+----------------------------------

+  * shared/misc.c: improve isnumb() (thanks to NJH) and move it to misc.c

+

 Fri Apr 29 02:57:07 CEST 2005 (tk)

 ----------------------------------

   * freshclam/manager.c: allow warning control via txt record

@@ -117,17 +117,6 @@ int checkaccess(const char *path, const char *username, int mode)

     return ret;

 }

-int isnumb(const char *str)

-{

-	int i;

-

-    for(i = 0; i < strlen(str); i++)

-	if(!isdigit(str[i]))

-	    return 0;

-

-    return 1;

-}

-

 int match_regex(const char *filename, const char *pattern)

 {

 #ifdef HAVE_REGEX_H

@@ -21,7 +21,6 @@

 int fileinfo(const char *filename, short i);

 int checkaccess(const char *path, const char *username, int mode);

-int isnumb(const char *str);

 int match_regex(const char *filename, const char *pattern);

 #endif

@@ -46,6 +46,7 @@

 #include "notify.h"

 #include "memory.h"

 #include "output.h"

+#include "misc.h"

 #include "../libclamav/others.h"

 #include "../libclamav/str.h" /* cli_strtok */

 #include "dns.h"

@@ -220,17 +221,6 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 	return 1;

 }

-static int isnumb(const char *str)

-{

-	int i;

-

-    for(i = 0; i < strlen(str); i++)

-	if(!isdigit(str[i]))

-	    return 0;

-

-    return 1;

-}

-

 int downloaddb(const char *localname, const char *remotename, const char *hostname, char *ip, int *signo, const struct cfgstruct *copt, const char *dnsreply, char *localip)

 {

 	struct cl_cvd *current, *remote;

@@ -30,17 +30,7 @@

 #include "defaults.h"

 #include "str.h"

 #include "memory.h"

-

-static int isnumb(const char *str)

-{

-	int i;

-

-    for(i = 0; i < strlen(str); i++)

-	if(!isdigit(str[i]))

-	    return 0;

-

-    return 1;

-}

+#include "misc.h"

 struct cfgstruct *parsecfg(const char *cfgfile, int messages)

 {

@@ -147,3 +147,14 @@ int filecopy(const char *src, const char *dest)

 #endif

 }

+

+int isnumb(const char *str)

+{

+    while(*str) {

+	if(!isdigit(*str))

+	    return 0;

+	str++;

+    }

+

+    return 1;

+}

@@ -24,5 +24,6 @@

 char *freshdbdir(void);

 void print_version(void);

 int filecopy(const char *src, const char *dest);

+int isnumb(const char *str);

 #endif