afp.h,afp_util.c added defines for AFP 3.0 3.1

path.h: preprocessor macro working with gcc 3.2

diff --git a/etc/afpd/afp_util.c b/etc/afpd/afp_util.c
index 94bd00ea6fa160e5ce9a447ba06735d34e6dc8f2..c76735213f48a35a1aec4ff0dad43d65042243ff 100644 (file)
--- a/etc/afpd/afp_util.c
+++ b/etc/afpd/afp_util.c
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_util.c,v 1.1 2002-03-16 20:39:04 jmarcus Exp $
+ * $Id: afp_util.c,v 1.2 2002-10-05 13:07:18 didg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -19,60 +19,70 @@
 const char *AfpNum2name(int num)
 {
        switch(num) {
-    case AFP_BYTELOCK    : return "AFP_BYTELOCK";       /*   1 */
-       case AFP_CLOSEVOL    : return "AFP_CLOSEVOL";           /*   2 */
-       case AFP_CLOSEDIR    : return "AFP_CLOSEDIR";           /*   3 */
-       case AFP_CLOSEFORK   : return "AFP_CLOSEFORK";          /*   4 */
-       case AFP_COPYFILE    : return "AFP_COPYFILE";           /*   5 */
-       case AFP_CREATEDIR   : return "AFP_CREATEDIR";          /*   6 */
-       case AFP_CREATEFILE  : return "AFP_CREATEFILE";         /*   7 */
-       case AFP_DELETE      : return "AFP_DELETE";             /*   8 */
-       case AFP_ENUMERATE   : return "AFP_ENUMERATE";          /*   9 */
-       case AFP_FLUSH       : return "AFP_FLUSH";                      /*      10 */
-       case AFP_FLUSHFORK   : return "AFP_FLUSHFORK";          /*      11 */
+    case AFP_BYTELOCK      : return "AFP_BYTELOCK";         /*   1 */
+       case AFP_CLOSEVOL      : return "AFP_CLOSEVOL";             /*   2 */
+       case AFP_CLOSEDIR      : return "AFP_CLOSEDIR";             /*   3 */
+       case AFP_CLOSEFORK     : return "AFP_CLOSEFORK";            /*   4 */
+       case AFP_COPYFILE      : return "AFP_COPYFILE";             /*   5 */
+       case AFP_CREATEDIR     : return "AFP_CREATEDIR";            /*   6 */
+       case AFP_CREATEFILE    : return "AFP_CREATEFILE";           /*   7 */
+       case AFP_DELETE        : return "AFP_DELETE";               /*   8 */
+       case AFP_ENUMERATE     : return "AFP_ENUMERATE";            /*   9 */
+       case AFP_FLUSH         : return "AFP_FLUSH";                /*  10 */
+       case AFP_FLUSHFORK     : return "AFP_FLUSHFORK";            /*  11 */
 
-       case AFP_GETFORKPARAM: return "AFP_GETFORKPARAM";       /*      14 */
-       case AFP_GETSRVINFO  : return "AFP_GETSRVINFO";         /*      15 */
-       case AFP_GETSRVPARAM : return "AFP_GETSRVPARAM";        /*      16 */
-       case AFP_GETVOLPARAM : return "AFP_GETVOLPARAM";        /*      17 */
-       case AFP_LOGIN       : return "AFP_LOGIN";              /*  18 */
-       case AFP_LOGOUT      : return "AFP_LOGOUT";             /*  20 */
-    case AFP_MAPID       : return "AFP_MAPID";          /*  21 */
-    case AFP_MAPNAME     : return "AFP_MAPNAME";        /*  22 */
-    case AFP_MOVE        : return "AFP_MOVE";           /*  23 */
-       case AFP_OPENVOL     : return "AFP_OPENVOL";            /*  24 */
-       case AFP_OPENDIR     : return "AFP_OPENDIR";            /*  25 */
-       case AFP_OPENFORK    : return "AFP_OPENFORK";           /*  26 */
-       case AFP_READ            : return "AFP_READ";                   /*  27 */
-    case AFP_RENAME      : return "AFP_RENAME";         /*  28 */
-    case AFP_SETDIRPARAM : return "AFP_SETDIRPARAM";    /*  29 */
-    case AFP_SETFILEPARAM: return "AFP_SETFILEPARAM";   /*  30 */
-    case AFP_SETFORKPARAM: return "AFP_SETFORKPARAM";   /*  31 */
-    case AFP_SETVOLPARAM : return "AFP_SETVOLPARAM ";   /*  32 */
-       case AFP_WRITE           : return "AFP_WRITE";                  /*  33 */
-       case AFP_GETFLDRPARAM: return "AFP_GETFLDRPARAM";       /*  34 */       
-       case AFP_SETFLDRPARAM: return "AFP_SETFLDRPARAM";       /*  35 */       
-       case AFP_CHANGEPW    : return "AFP_CHANGEPW";       /*  36 */   
+       case AFP_GETFORKPARAM  : return "AFP_GETFORKPARAM";     /*      14 */
+       case AFP_GETSRVINFO    : return "AFP_GETSRVINFO";           /*  15 */
+       case AFP_GETSRVPARAM   : return "AFP_GETSRVPARAM";      /*      16 */
+       case AFP_GETVOLPARAM   : return "AFP_GETVOLPARAM";      /*      17 */
+       case AFP_LOGIN         : return "AFP_LOGIN";                /*  18 */
+       case AFP_LOGOUT        : return "AFP_LOGOUT";               /*  20 */
+    case AFP_MAPID         : return "AFP_MAPID";            /*  21 */
+    case AFP_MAPNAME       : return "AFP_MAPNAME";          /*  22 */
+    case AFP_MOVE          : return "AFP_MOVE";             /*  23 */
+       case AFP_OPENVOL       : return "AFP_OPENVOL";              /*  24 */
+       case AFP_OPENDIR       : return "AFP_OPENDIR";              /*  25 */
+       case AFP_OPENFORK      : return "AFP_OPENFORK";             /*  26 */
+       case AFP_READ              : return "AFP_READ";                     /*  27 */
+    case AFP_RENAME        : return "AFP_RENAME";           /*  28 */
+    case AFP_SETDIRPARAM   : return "AFP_SETDIRPARAM";      /*  29 */
+    case AFP_SETFILEPARAM  : return "AFP_SETFILEPARAM";     /*  30 */
+    case AFP_SETFORKPARAM  : return "AFP_SETFORKPARAM";     /*  31 */
+    case AFP_SETVOLPARAM   : return "AFP_SETVOLPARAM ";     /*  32 */
+       case AFP_WRITE             : return "AFP_WRITE";                    /*  33 */
+       case AFP_GETFLDRPARAM  : return "AFP_GETFLDRPARAM";         /*  34 */   
+       case AFP_SETFLDRPARAM  : return "AFP_SETFLDRPARAM";         /*  35 */   
+       case AFP_CHANGEPW      : return "AFP_CHANGEPW";         /*  36 */       
 
-    case AFP_GETSRVRMSG  : return "AFP_GETSRVRMSG";     /*  38 */
-    case AFP_CREATEID    : return "AFP_CREATEID";       /*  39 */
-    case AFP_DELETEID    : return "AFP_DELETEID";       /*  40 */
-    case AFP_RESOLVEID   : return "AFP_RESOLVEID";      /*  41 */
-    case AFP_EXCHANGEFILE: return "AFP_EXCHANGEFILE";   /*  42 */
-    case AFP_CATSEARCH   : return "AFP_CATSEARCH";      /*  43 */
+    case AFP_GETSRVRMSG    : return "AFP_GETSRVRMSG";       /*  38 */
+    case AFP_CREATEID      : return "AFP_CREATEID";         /*  39 */
+    case AFP_DELETEID      : return "AFP_DELETEID";         /*  40 */
+    case AFP_RESOLVEID     : return "AFP_RESOLVEID";        /*  41 */
+    case AFP_EXCHANGEFILE  : return "AFP_EXCHANGEFILE";     /*  42 */
+    case AFP_CATSEARCH     : return "AFP_CATSEARCH";        /*  43 */
 
-       case AFP_OPENDT      : return "AFP_OPENDT";                     /*  48 */
-       case AFP_CLOSEDT     : return "AFP_CLOSEDT";            /*      49 */
-    case AFP_GETICON     : return "AFP_GETICON";               /*      51 */
-    case AFP_GTICNINFO   : return "AFP_GTICNINFO";             /*      52 */
-    case AFP_ADDAPPL     : return "AFP_ADDAPPL";               /*      53 */
-    case AFP_RMVAPPL     : return "AFP_RMVAPPL";               /*      54 */
-    case AFP_GETAPPL     : return "AFP_GETAPPL";       /*      55 */
-    case AFP_ADDCMT      : return "AFP_ADDCMT";        /*      56 */
-       case AFP_RMVCMT      : return "AFP_RMVCMT";             /*      57 */
-       case AFP_GETCMT      : return "AFP_GETCMT";             /*      58 */
+       case AFP_OPENDT        : return "AFP_OPENDT";                   /*  48 */
+       case AFP_CLOSEDT       : return "AFP_CLOSEDT";              /*  49 */
+    case AFP_GETICON       : return "AFP_GETICON";                 /*  51 */
+    case AFP_GTICNINFO     : return "AFP_GTICNINFO";           /*      52 */
+    case AFP_ADDAPPL       : return "AFP_ADDAPPL";             /*      53 */
+    case AFP_RMVAPPL       : return "AFP_RMVAPPL";             /*      54 */
+    case AFP_GETAPPL       : return "AFP_GETAPPL";             /*      55 */
+    case AFP_ADDCMT        : return "AFP_ADDCMT";              /*      56 */
+       case AFP_RMVCMT        : return "AFP_RMVCMT";           /*      57 */
+       case AFP_GETCMT        : return "AFP_GETCMT";           /*      58 */
+    /* version 3.0 */
+    case AFP_BYTELOCK_EXT  : return "AFP_BYTELOCK_EXT";     /*  59 */
+    case AFP_READ_EXT      : return "AFP_READ_EXT";         /*  60 */
+    case AFP_WRITE_EXT     : return "AFP_WRITE_EXT";        /*  61 */
+    case AFP_GETSESSTOKEN  : return "AFP_GETSESSTOKEN";     /*  64 */ 
+    case AFP_DISCTOLDSESS  : return "AFP_DISCTOLDSESS";     /*  65 */
+    case AFP_ENUMERATE_EXT : return "AFP_ENUMERATE_EXT";    /*  66 */
+    case AFP_CATSEARCH_EXT : return "AFP_CATSEARCH_EXT";    /*  67 */
+    /* version 3.1 */
+    case AFP_ENUMERATE_EXT2: return "AFP_ENUMERATE_EXT2";   /*  68 */
                                                                                                                          
-       case AFP_ADDICON     : return "AFP_ADDICON";            /* 192 */
+       case AFP_ADDICON       : return "AFP_ADDICON";          /* 192 */
        }                                                                                         
        return "not yet defined";                                                                 
 }

diff --git a/include/atalk/afp.h b/include/atalk/afp.h
index d1b09e298c99650e842a829ba008cb325d011164..987556e4615b017d2be02972e790cc28e56517f5 100644 (file)
--- a/include/atalk/afp.h
+++ b/include/atalk/afp.h
@@ -180,4 +180,16 @@ typedef enum {
 #define AFP_GETCMT          58
 #define AFP_ADDICON        192
 
+/* version 3.0 */
+#define AFP_BYTELOCK_EXT        59
+#define AFP_CATSEARCH_EXT       67
+#define AFP_ENUMERATE_EXT       66
+#define AFP_READ_EXT            60
+#define AFP_WRITE_EXT           61
+#define AFP_GETSESSTOKEN        64
+#define AFP_DISCTOLDSESS        65
+
+/* version 3.1 */
+#define AFP_ENUMERATE_EXT2      68
+
 #endif

diff --git a/include/atalk/paths.h b/include/atalk/paths.h
index 0029cbffcfedbf9fca2d36e0437ce9a37f724110..d1ea062184b15adc0c2037d2e1ad2ae938bf3da8 100644 (file)
--- 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