isdnlog Version 3.34

fixed some memory faults

isdnlog/Makefile.in

@@ -19,6 +19,12 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##
 ## $Log$
+## Revision 1.86  1999/06/15 20:02:54  akool
+## isdnlog Version 3.33
+##   - big step in using the new zone files
+##   - *This*is*not*a*production*ready*isdnlog*!!
+##   - Maybe the last release before the I4L meeting in Nuernberg
+##
 ## Revision 1.85  1999/06/13 14:06:53  akool
 ## isdnlog Version 3.32
 ##
@@ -676,7 +682,7 @@ SERVICEFILE = /etc/services
 # DON'T EDIT BELOW THIS LINE
 ######################################################################
 
-VERSION     = 3.33
+VERSION     = 3.34
 
 MANPAGES    = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
 	      isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \

isdnlog/countries-de.dat

@@ -1,4 +1,7 @@
-V:1.02-German [03-Jun-1999 19:46:35]
+V:1.02-Germany [16-Jun-1999 21:08:11]
+
+# $Id$
+#
 
 N:Usbekistan
 A:Uzbekistan
@@ -336,7 +339,7 @@ N:Norfolkinseln
 A:Norfolkinseln (Australien), Norfolk Islands, Norfolk, Norfolk Island, Norfolk Island (Antarctica)
 C:+6723
 
-N:Kokosinseln 
+N:Kokosinseln
 A:Kokosinseln (Australien), Cocos Island, Cocos Island (Antarctica)
 C:+6722, +6189162
 
@@ -515,9 +518,6 @@ N:Deutschland
 A:Germany
 C:+49
 
-N:Frankfurt
-C:+496102
-
 N:Polen
 A:Poland
 C:+48
@@ -552,8 +552,11 @@ C:+45
 N:Großbritannien Mobilfunk
 C:+44991, +44979, +44976, +44973, +44966, +44961, +449589, +449587, +449586, +449585, +449584, +449583, +449582, +44941, +44930, +44918, +44910, +4489, +44881, +44860, +44853, +44850, +44839, +44836, +44831, +44802, +447, +44696, +4466, +44640, +44632, +44589, +44585, +44469, +44468, +44467, +444624, +44448, +44441, +444325, +44421, +44411, +44410, +44403, +44402, +44401, +44378, +443749, +443748, +443747, +443746, +443744, +443743, +443742, +443741, +443740, +44338, +44336, +44331, +441693, +441523, +441459, +441426, +44139
 
-N:London
-C:+44171,+44181
+N:London (Außenbezirk)
+C:+44181
+
+N:London (Innenbezirk)
+C:+44171
 
 N:Edinburgh
 C:+44131
@@ -565,21 +568,20 @@ C:+44
 N:Nordirland
 C:+44 /* Fixme */
 
-N:Österreich
-A:Austria
-C:+43
-
-N:Wien
-A:Vienna
-C:+431,+43222
-
 N:Österreich Mobilfunk
-C:+43663, +43664, +43676, +43699
+C:+43699, +43676, +43664, +43663
 
 N:Österreich Auskunft
 A:Auskunft Austria
 C:+4366211811
 
+N:Wien
+C:+431
+
+N:Österreich
+A:Austria
+C:+43
+
 N:Liechtenstein
 A:Lichtenstein
 C:+423, +4175
@@ -721,9 +723,6 @@ N:Luxemburg
 A:Luxembourg
 C:+352
 
-N:Luxemburg City
-C:+3521
-
 N:Azoren
 C:+35196, +35195, +35192
 

isdnlog/isdnconf/isdnconf.c

@@ -20,6 +20,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Log$
+ * Revision 1.32  1999/06/15 20:03:46  akool
+ * isdnlog Version 3.33
+ *   - big step in using the new zone files
+ *   - *This*is*not*a*production*ready*isdnlog*!!
+ *   - Maybe the last release before the I4L meeting in Nuernberg
+ *
  * Revision 1.31  1999/06/13 14:07:28  akool
  * isdnlog Version 3.32
  *
@@ -1267,7 +1273,7 @@ int main(int argc, char *argv[], char *envp[])
                                 }
 				else {
                                   if (isalpha(*areacode)) {
-				    if (getCountry(areacode, &Country))
+				    if (getCountry(areacode, &Country) != UNKNOWN)
 				      strcpy(areacode, Country->Code[0]);
                                   } /* if */
 
@@ -1296,7 +1302,7 @@ int main(int argc, char *argv[], char *envp[])
 #endif
 
                                 if (zone2 == UNKNOWN) {
-				  if (getCountrycode(areacode, &country))
+				  if (getCountrycode(areacode, &country) != UNKNOWN)
                                     print_msg(PRT_NORMAL, "Ein %d Sekunden langes Gespraech nach %s (%s) kostet am %s",
                                       duration, country, areacode, ctime(&Rate.start));
                                   else

isdnlog/isdnrep/isdnrep.c

@@ -24,6 +24,12 @@
  *
  *
  * $Log$
+ * Revision 1.68  1999/06/15 20:04:31  akool
+ * isdnlog Version 3.33
+ *   - big step in using the new zone files
+ *   - *This*is*not*a*production*ready*isdnlog*!!
+ *   - Maybe the last release before the I4L meeting in Nuernberg
+ *
  * Revision 1.67  1999/06/09 19:58:44  akool
  * isdnlog Version 3.31
  *  - Release 0.91 of zone-Database (aka "Verzonungstabelle")
@@ -910,7 +916,7 @@ int read_logfile(char *myname)
 
   /* FIXME: */
   initHoliday(holifile, NULL);
-  initRate("/etc/isdn/rate.conf", "/usr/lib/isdn/rate-de.dat", "/usr/lib/isdn/rate-de-%s.gdbm", NULL);
+  initRate("/etc/isdn/rate.conf", "/usr/lib/isdn/rate-de.dat", "/usr/lib/isdn/zone-de-%s.gdbm", NULL);
   currency = strdup("DM");
   vbn = strdup("010");
   interns0 = 3;

isdnlog/tools/country.c

@@ -19,6 +19,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Log$
+ * Revision 1.3  1999/06/15 20:04:58  akool
+ * isdnlog Version 3.33
+ *   - big step in using the new zone files
+ *   - *This*is*not*a*production*ready*isdnlog*!!
+ *   - Maybe the last release before the I4L meeting in Nuernberg
+ *
  * Revision 1.2  1999/06/03 18:51:11  akool
  * isdnlog Version 3.30
  *  - rate-de.dat V:1.02-Germany [03-Jun-1999 19:49:22]
@@ -383,7 +389,7 @@ int getCountry (char *name, COUNTRY **country)
     }
     return UNKNOWN;
   }
-  
+
   xname=xlat(name);
 
   for (i=0; i<nCountry; i++) {
@@ -404,7 +410,7 @@ int getCountry (char *name, COUNTRY **country)
       }
     }
   }
-  return m;
+  return((m == 666) ? UNKNOWN : m);
 }
 
 int getCountrycode(char *number, char **name)
@@ -413,7 +419,7 @@ int getCountrycode(char *number, char **name)
 
   if (name)
     *name="";
-    
+
   m=UNKNOWN;
   for (i=0; i<nCountry; i++) {
     for (j=0; j<Country[i].nCode; j++) {
@@ -447,7 +453,7 @@ void main (int argc, char *argv[])
       printf ("<%s>=<%s> d=%d\n", argv[i], country->Name, d);
 #else
     d=getCountrycode (argv[i], &msg);
-    printf ("<%s>=<%s> d=%d\n", argv[i], msg, d);  
+    printf ("<%s>=<%s> d=%d\n", argv[i], msg, d);
 #endif
   }
 }

isdnlog/tools/rate.c

@@ -19,6 +19,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Log$
+ * Revision 1.21  1999/06/15 20:05:13  akool
+ * isdnlog Version 3.33
+ *   - big step in using the new zone files
+ *   - *This*is*not*a*production*ready*isdnlog*!!
+ *   - Maybe the last release before the I4L meeting in Nuernberg
+ *
  * Revision 1.20  1999/06/09 19:59:20  akool
  * isdnlog Version 3.31
  *  - Release 0.91 of zone-Database (aka "Verzonungstabelle")
@@ -645,7 +651,7 @@ int initRate(char *conf, char *dat, char *dom, char **msg)
       s+=2; while (isblank(*s)) s++;
       snprintf (path, LENGTH, dom, s);
       if (initZone(prefix, path, &c)==0) {
-	notice (c);
+	notice ("%s", c);
       } else {
 	warning (dat, c);
       }

isdnlog/tools/tools.c

@@ -19,6 +19,12 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Log$
+ * Revision 1.29  1999/06/15 20:05:20  akool
+ * isdnlog Version 3.33
+ *   - big step in using the new zone files
+ *   - *This*is*not*a*production*ready*isdnlog*!!
+ *   - Maybe the last release before the I4L meeting in Nuernberg
+ *
  * Revision 1.28  1999/06/03 18:51:22  akool
  * isdnlog Version 3.30
  *  - rate-de.dat V:1.02-Germany [03-Jun-1999 19:49:22]
@@ -681,9 +687,7 @@ char *vnum(int chan, int who)
       auto     char *s;
 
 
-      i = getCountrycode(call[chan].num[who], &s);
-
-      if (i) {
+      if ((i = getCountrycode(call[chan].num[who], &s)) != UNKNOWN) {
         Strncpy(call[chan].areacode[who], call[chan].num[who], i + 1);
 	strcpy(call[chan].rufnummer[who], call[chan].num[who] + i);
 	*call[chan].vorwahl[who] = 0;