[Netatalk-cvs] netatalk/include/atalk util.h, 1.8, 1.9 volinfo.h, 1.3, 1.4

[franklahm <fra...@us...>]

Update of /cvsroot/netatalk/netatalk/include/atalk
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18898/include/atalk

Modified Files:
	util.h volinfo.h 
Log Message:
New utility to maintain dbd databases: dbd. Also replaces cnid_index. Still incomplete.

Index: util.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/include/atalk/util.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** util.h	28 Apr 2005 20:49:51 -0000	1.8
--- util.h	28 Apr 2009 13:01:24 -0000	1.9
***************
*** 82,88 ****
  #endif /* ! HAVE_DLFCN_H */
  
! 
  /* volinfo for shell utilities */
- 
  #define VOLINFOFILE ".volinfo"
  
--- 82,87 ----
  #endif /* ! HAVE_DLFCN_H */
  
! #if 0
  /* volinfo for shell utilities */
  #define VOLINFOFILE ".volinfo"
  
***************
*** 106,109 ****
--- 105,109 ----
  extern int loadvolinfo __P((char *path, struct volinfo *vol));
  extern int vol_load_charsets __P(( struct volinfo *vol));
+ #endif /* 0 */
  
  #endif

Index: volinfo.h
===================================================================
RCS file: /cvsroot/netatalk/netatalk/include/atalk/volinfo.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** volinfo.h	27 Apr 2009 07:58:26 -0000	1.3
--- volinfo.h	28 Apr 2009 13:01:24 -0000	1.4
***************
*** 6,9 ****
--- 6,11 ----
  #define _ATALK_VOLINFO_H 1
  
+ #include <atalk/unicode.h>
+ 
  /* FIXME: following duplicated from etc/afpd/volume.h  */
  
***************
*** 34,38 ****
  #define AFPVOL_ACLS      (1 << 25)   /* Volume supports ACLS */
  
- 
  /* handle casefolding */
  #define AFPVOL_MTOUUPPER       (1 << 0)
--- 36,39 ----
***************
*** 45,48 ****
--- 46,71 ----
  #define AFPVOL_ULOWERMUPPER    (AFPVOL_MTOULOWER | AFPVOL_UTOMUPPER)
  
+ /* volinfo for shell utilities */
+ #define VOLINFOFILE ".volinfo"
+ 
+ struct volinfo {
+     char                *v_name;
+     char                *v_path;
+     int                 v_flags;
+     int                 v_casefold;
+     char                *v_cnidscheme;
+     char                *v_dbpath;
+     char                *v_volcodepage;
+     charset_t           v_volcharset;
+     char                *v_maccodepage;
+     charset_t           v_maccharset;
+     int                 v_adouble;  /* default adouble format */
+     char                *(*ad_path)(const char *, int);
+     char                *v_dbd_host;
+     int                 v_dbd_port;
+ };
+ 
+ extern int loadvolinfo(char *path, struct volinfo *vol);
+ extern int vol_load_charsets(struct volinfo *vol);
  
  #endif