X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fatalk%2Fpaths.h;h=ec67a4e3f27e1768af46f5dcce4916c89c7a3720;hb=102d8b342b41e714ce5cf36e4c6cade74caeb9fc;hp=ac77f150c745fa0c369484737f45f6c7e9571df4;hpb=31843674b7bd32eabcce3a1ad6159b4f94921f79;p=netatalk.git

diff --git a/include/atalk/paths.h b/include/atalk/paths.h
index ac77f150..ec67a4e3 100644
--- a/include/atalk/paths.h
+++ b/include/atalk/paths.h
@@ -7,7 +7,7 @@
 #define BROKEN_ECHO(a)    a
 #define ATALKPATHCAT(a,b) BROKEN_ECHO(a)##BROKEN_ECHO(b)
 #else
-#define ATALKPATHCAT(a,b) a##b
+#define ATALKPATHCAT(a,b) a b
 #endif
 #else
 #define ATALKPATHCAT(a,b) a/**/b
@@ -15,20 +15,20 @@
 
 
 /* lock file path. this should be re-organized a bit. */
-#ifndef _PATH_LOCKDIR
-#ifdef BSD4_4
-#ifdef MACOSX_SERVER
-#define _PATH_LOCKDIR		"/var/run/"
-#else
-#define _PATH_LOCKDIR           "/var/spool/lock/"
-#endif
-#else
-#ifdef linux
-#define _PATH_LOCKDIR           "/var/lock/"
-#else
-#define _PATH_LOCKDIR           "/var/spool/locks/"
-#endif /* linux */
-#endif /* BSD4_4 */
+#if ! defined (_PATH_LOCKDIR)
+#  if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+#    define _PATH_LOCKDIR	"/var/run/"
+#  elif defined (BSD4_4)
+#    ifdef MACOSX_SERVER
+#      define _PATH_LOCKDIR	"/var/run/"
+#    else
+#      define _PATH_LOCKDIR	"/var/spool/lock/"
+#    endif
+#  elif defined (linux)
+#    define _PATH_LOCKDIR	"/var/lock/"
+#  else
+#    define _PATH_LOCKDIR	"/var/spool/locks/"
+#  endif
 #endif
 
 /*
@@ -37,32 +37,54 @@
 #define _PATH_PAPDPRINTCAP	"/etc/printcap"
 #ifdef ultrix
 #define _PATH_PAPDSPOOLDIR	"/usr/spool/lpd"
-#else ultrix
+#else /* !ultrix */
 #define _PATH_PAPDSPOOLDIR	"/var/spool/lpd"
-#endif ultrix
+#endif /* ultrix */
 #ifdef BSD4_4
 #define _PATH_DEVPRINTER	"/var/run/printer"
-#else BSD4_4
+#else /* !BSD4_4 */
 #define _PATH_DEVPRINTER	"/dev/printer"
-#endif BSD4_4
+#endif /* BSD4_4 */
 
 /*
  * atalkd paths
  */
 #define _PATH_ATALKDEBUG	"/tmp/atalkd.debug"
 #define _PATH_ATALKDTMP		"atalkd.tmp"
-#define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+#  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
+#else
+#  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
+#endif
 
 /*
  * psorder paths
  */
 #define _PATH_TMPPAGEORDER	"/tmp/psorderXXXXXX"
-#define _PATH_PAPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"papd")
+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+#  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid")
+#else
+#  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd")
+#endif
 
 /*
  * afpd paths
  */
 #define _PATH_AFPTKT		"/tmp/AFPtktXXXXXX"
-#define _PATH_AFPDLOCK		ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+#  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
+#else
+#  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
+#define _PATH_AFP_IPC       ATALKPATHCAT(_PATH_LOCKDIR,"afpd_ipc")
+#endif
+
+/*
+ * cnid_metad paths
+ */
+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+#  define _PATH_CNID_METAD_LOCK	ATALKPATHCAT(_PATH_LOCKDIR,"cnid_metad.pid")
+#else
+#  define _PATH_CNID_METAD_LOCK	ATALKPATHCAT(_PATH_LOCKDIR,"cnid_metad")
+#endif
 
 #endif /* atalk/paths.h */