From 3c34b9da05f5bef4954c04d8ee6b9e171bfbef80 Mon Sep 17 00:00:00 2001
From: Henning Geinitz <sane@geinitz.org>
Date: Sun, 6 Jan 2002 20:43:10 +0000
Subject: [PATCH] Added implementation of inet_ntop() for platforms withouth
 this function based on inet_ntoa. Henning Meier-Geinitz
 <henning@meier-geinitz.de>

---
 backend/Makefile.in |  9 +++++++--
 lib/Makefile.in     |  4 ++--
 lib/inet_ntop.c     | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 lib/inet_ntop.c

diff --git a/backend/Makefile.in b/backend/Makefile.in
index 8cc2b2275..0d05a1cb1 100644
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@@ -57,7 +57,7 @@ PRELOADABLE_BACKENDS = abaton agfafocus apple artec as6e avision bh canon \
         coolscan dc25 @DC210@ @DC240@ dmc epson @GPHOTO2@ hp m3096g \
 	microtek microtek2 mustek mustek_pp mustek_usb nec @NET@ pie @PINT@ \
 	plustek @PNM@ @QCAM@ ricoh s9036 sharp @SM3600@ @SNAPSCAN@ sp15c \
-	st400 tamarack umax umax_pp @V4L@
+	st400 tamarack umax umax_pp umax1220u @V4L@
 ALL_BACKENDS = $(PRELOADABLE_BACKENDS) dll
 
 LIBS = $(addprefix libsane-,$(addsuffix .la,$(ALL_BACKENDS)))
@@ -67,7 +67,7 @@ EXTRA = sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo
 
 # With libtool-1.0, we have to mention each library object explicitly... ;-(
 LIBLIB_FUNCS = alloca getenv getopt getopt1 isfdtype sigprocmask snprintf \
-        strdup strndup strsep usleep vsyslog
+        strdup strndup strsep usleep vsyslog inet_ntop
 LIBOBJS = $(addprefix ../lib/,$(addsuffix .lo,$(LIBLIB_FUNCS)))
 
 libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
@@ -277,6 +277,10 @@ libsane-umax.la: ../sanei/sanei_scsi.lo
 libsane-v4l.la: ../sanei/sanei_constrain_value.lo
 libsane-umax_pp.la: $(addsuffix .lo,$(EXTRA_umax_pp))
 libsane-umax_pp.la: ../sanei/sanei_constrain_value.lo
+libsane-umax1220u.la: ../sanei/sanei_config2.lo
+libsane-umax1220u.la: ../sanei/sanei_constrain_value.lo
+libsane-umax1220u.la: ../sanei/sanei_usb.lo
+libsane-umax1220u.la: ../sanei/sanei_pv8630.lo
 
 ifneq ($(DLL_PRELOAD),)
 # need to make dll dependent on all sanei files:
@@ -291,6 +295,7 @@ libsane-dll.la libsane.la: ../sanei/sanei_ab306.lo
 libsane-dll.la libsane.la: ../sanei/sanei_pio.lo
 libsane-dll.la libsane.la: ../sanei/sanei_pa4s2.lo
 libsane-dll.la libsane.la: ../sanei/sanei_usb.lo
+libsane-dll.la libsane.la: ../sanei/sanei_pv8630.lo
 endif
 
 depend:
diff --git a/lib/Makefile.in b/lib/Makefile.in
index e44c845f6..0ec97550c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -44,10 +44,10 @@ MLINK	= --mode=link
 
 LIBLIB_OBJS     = alloca.o getopt.o getopt1.o sigprocmask.o strndup.o \
                   strdup.o strsep.o snprintf.o usleep.o getenv.o \
-                  isfdtype.o vsyslog.o md5.o
+                  isfdtype.o vsyslog.o md5.o inet_ntop.o
 LIBLIB_LTOBJS   = alloca.lo getopt.lo getopt1.lo sigprocmask.lo strndup.lo \
                   strdup.lo strsep.lo snprintf.lo usleep.lo getenv.lo \
-                  isfdtype.lo vsyslog.lo md5.lo
+                  isfdtype.lo vsyslog.lo md5.lo inet_ntop.lo
 
 TARGETS = $(LIBLIB_OBJS)
 TARGETS = liblib.a
diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
new file mode 100644
index 000000000..1522e4f00
--- /dev/null
+++ b/lib/inet_ntop.c
@@ -0,0 +1,32 @@
+#include "../include/sane/config.h"
+
+#ifndef HAVE_INET_NTOP
+
+#include <arpa/inet.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <string.h>
+
+const char *
+inet_ntop (int af, const void *src, char *dst, size_t cnt)
+{
+  struct in_addr in;
+  char *text_addr;
+
+  if (af == AF_INET)
+    {
+      memcpy (&in.s_addr, src, sizeof (in.s_addr));
+      text_addr = inet_ntoa (in);
+      if (text_addr && dst)
+	{
+	  strncpy (dst, text_addr, cnt);
+	  return dst;
+	}
+      else
+	return 0;
+    }
+  return 0;
+}
+
+#endif /* !HAVE_INET_NTOP */