Move safe_ato[il]() to misc.[ch]

src/misc.c

@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2009 Julien BLACHE <jb@jblache.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <limits.h>
+
+#include "daapd.h"
+#include "err.h"
+#include "misc.h"
+
+
+int
+safe_atoi(const char *str, int *val)
+{
+  char *end;
+  long intval;
+
+  errno = 0;
+  intval = strtol(str, &end, 10);
+
+  if (((errno == ERANGE) && ((intval == LONG_MAX) || (intval == LONG_MIN)))
+      || ((errno != 0) && (intval == 0)))
+    {
+      DPRINTF(E_DBG, L_MISC, "Invalid integer in string (%s): %s\n", str, strerror(errno));
+
+      return -1;
+    }
+
+  if (end == str)
+    {
+      DPRINTF(E_DBG, L_MISC, "No integer found in string (%s)\n", str);
+
+      return -1;
+    }
+
+  if (intval > INT_MAX)
+    {
+      DPRINTF(E_DBG, L_MISC, "Integer value too large (%s)\n", str);
+
+      return -1;
+    }
+
+  *val = (int)intval;
+
+  return 0;
+}
+
+int
+safe_atol(const char *str, long *val)
+{
+  char *end;
+  long intval;
+
+  errno = 0;
+  intval = strtol(str, &end, 10);
+
+  if (((errno == ERANGE) && ((intval == LONG_MAX) || (intval == LONG_MIN)))
+      || ((errno != 0) && (intval == 0)))
+    {
+      DPRINTF(E_DBG, L_MISC, "Invalid integer in string (%s): %s\n", str, strerror(errno));
+
+      return -1;
+    }
+
+  if (end == str)
+    {
+      DPRINTF(E_DBG, L_MISC, "No integer found in string (%s)\n", str);
+
+      return -1;
+    }
+
+  *val = intval;
+
+  return 0;
+}