From 4fef95e29456f8eda492fe684a92fbd11176e066 Mon Sep 17 00:00:00 2001
From: Frank Lahm <franklahm@googlemail.com>
Date: Sun, 14 Oct 2012 12:05:12 +0200
Subject: [PATCH] Move (unused) file gettok.c to libatalk

---
 etc/afpd/Makefile.am                 | 1 -
 include/atalk/globals.h              | 4 ----
 include/atalk/util.h                 | 7 +++++++
 libatalk/libatalk-3.0.1dev.abi       | 2 ++
 libatalk/util/Makefile.am            | 1 +
 {etc/afpd => libatalk/util}/gettok.c | 0
 6 files changed, 10 insertions(+), 5 deletions(-)
 rename {etc/afpd => libatalk/util}/gettok.c (100%)

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 85b51dc8..1cb8913a 100644
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -28,7 +28,6 @@ afpd_SOURCES = \
 	file.c \
 	filedir.c \
 	fork.c \
-	gettok.c \
 	hash.c \
 	main.c \
 	mangle.c \
diff --git a/include/atalk/globals.h b/include/atalk/globals.h
index b8412d15..36508e17 100644
--- a/include/atalk/globals.h
+++ b/include/atalk/globals.h
@@ -151,10 +151,6 @@ extern void afp_options_free(struct afp_options *);
 extern void setmessage (const char *);
 extern void readmessage (AFPObj *);
 
-/* gettok.c */
-extern void initline   (int, char *);
-extern int  parseline  (int, char *);
-
 /* afp_util.c */
 extern const char *AfpNum2name (int );
 extern const char *AfpErr2name(int err);
diff --git a/include/atalk/util.h b/include/atalk/util.h
index 9ff6813f..39237e7c 100644
--- a/include/atalk/util.h
+++ b/include/atalk/util.h
@@ -190,4 +190,11 @@ extern char *realpath_safe(const char *path);
 
 extern bstring rel_path_in_vol(const char *path, const char *volpath);
 
+/******************************************************************
+ * cnid.c
+ *****************************************************************/
+
+extern void initline   (int, char *);
+extern int  parseline  (int, char *);
+
 #endif  /* _ATALK_UTIL_H */
diff --git a/libatalk/libatalk-3.0.1dev.abi b/libatalk/libatalk-3.0.1dev.abi
index 645af2b1..fd06b366 100644
--- a/libatalk/libatalk-3.0.1dev.abi
+++ b/libatalk/libatalk-3.0.1dev.abi
@@ -309,6 +309,7 @@ iniparser_set: int (dictionary *, char *, char *, char *)
 iniparser_unset: void (dictionary *, char *, char *)
 _init: <text variable, no debug info>
 init_iconv: void (void)
+initline: void (int, char *)
 initvol_vfs: void (struct vol *)
 ipc_child_write: int (int, uint16_t, int, void *)
 ipc_client_uds: int (const char *)
@@ -356,6 +357,7 @@ netatalk_unlinkat: int (int, const char *)
 nftw: int (const char *, nftw_func_t, dir_notification_func_t, int, int)
 opendirat: DIR *(int, const char *)
 openflags2logstr: const char *(int)
+parseline: int (int, char *)
 posix_chmod: int (const char *, mode_t)
 posix_fchmod: int (int, mode_t)
 precompose_w: size_t (uint16_t *, size_t, uint16_t *, size_t *)
diff --git a/libatalk/util/Makefile.am b/libatalk/util/Makefile.am
index 65ad1d6c..20195166 100644
--- a/libatalk/util/Makefile.am
+++ b/libatalk/util/Makefile.am
@@ -9,6 +9,7 @@ libutil_la_SOURCES = \
 	cnid.c		\
 	fault.c		\
 	getiface.c	\
+	gettok.c	\
 	locking.c   \
 	logger.c	\
 	module.c	\
diff --git a/etc/afpd/gettok.c b/libatalk/util/gettok.c
similarity index 100%
rename from etc/afpd/gettok.c
rename to libatalk/util/gettok.c
-- 
2.39.2