2007.

[idzebra-moved-to-github.git] / data1 / d1_attset.c

diff --git a/data1/d1_attset.c b/data1/d1_attset.c
index 17963e9..4e2bd9e 100644 (file)
--- a/data1/d1_attset.c
+++ b/data1/d1_attset.c
@@ -1,5 +1,5 @@
-/* $Id: d1_attset.c,v 1.10 2006-05-19 23:45:28 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: d1_attset.c,v 1.13 2007-01-15 15:10:14 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdio.h>
@@ -84,6 +84,7 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
        {
            int num;
            char *name;
+            char *endptr;
            data1_att *t;
            
            if (argc < 3)
@@ -96,7 +97,13 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
                yaz_log(YLOG_WARN, "%s:%d: Local attributes not supported",
                         file, lineno);
            }
-           num = atoi (argv[1]);
+            num = strtol(argv[1], &endptr, 10);
+            if (*endptr != '\0')
+            {
+               yaz_log(YLOG_WARN, "%s:%d: Bad attribute integer %s",
+                        file, lineno, argv[1]);
+               continue;
+            }
            name = argv[2];
            
            t = *attp = (data1_att *)nmem_malloc(mem, sizeof(*t));