roken merge

[Derrick J Brashear]

Arla has one libroken. Heimdal has another. I wanted to build Arla, and
because I had Heimdal installed, I hated life.

Since my assumption is the Heimdal one is more authoritative, here are
patches to merge it:
a) patch for lib/roken/Makefile.am
  this may be slightly incorrect given i don't know what the difference
  between libroken_la_SOURCES and EXTRA_libroken_la_SOURCES
b) patch for lib/roken/roken.h.in to add missing structures defines etc
c) files in arla libroken not in heimdal libroken, in a tar.gz
  these files are:
  copy_basename.c  eefile.c  epopen.c      str2inaddr.c  strsplit.c
  copy_dirname.c   efile.c   inaddr2str.c  strmatch.c    strtrim.c

Now life sucks less. Or differently. Or something.

-D



*** Makefile.am.old	Sun Aug 13 14:33:21 2000
--- Makefile.am	Sun Aug 13 14:35:27 2000
***************
*** 35,42 ****
--- 35,47 ----
  libroken_la_SOURCES =		\
  	base64.c		\
  	concat.c		\
+ 	copy_basename.c		\
+ 	copy_dirname.c		\
+ 	eefile.c		\
+ 	efile.c			\
  	emalloc.c		\
  	environment.c		\
+ 	epopen.c		\
  	eread.c			\
  	erealloc.c		\
  	estrdup.c		\
***************
*** 46,51 ****
--- 51,57 ----
  	get_window_size.c	\
  	getarg.c		\
  	getnameinfo_verified.c	\
+ 	inaddr2str.c		\
  	issuid.c		\
  	k_getpwnam.c		\
  	k_getpwuid.c		\
***************
*** 63,69 ****
--- 69,79 ----
  	simple_exec.c		\
  	snprintf.c		\
  	socket.c		\
+ 	str2inaddr.c		\
  	strcollect.c		\
+ 	strmatch.c		\
+ 	strsplit.c		\
+ 	strtrim.c		\
  	timeval.c		\
  	tm2time.c		\
  	verify.c		\


*** roken.h.in.orig	Sun Aug 13 14:41:26 2000
--- roken.h.in	Sun Aug 13 14:44:55 2000
***************
*** 374,379 ****
--- 374,383 ----
  
  int unix_verify_user(char *user, char *password);
  
+ void inaddr2str(struct in_addr addr, char *s, size_t len);
+ 
+ struct in_addr *str2inaddr (const char *s, struct in_addr *ret);
+ 
  void mini_inetd (int port);
  
  int roken_concat (char *s, size_t len, ...);
***************
*** 590,595 ****
--- 594,695 ----
  
  void set_progname(char *argv0);
  const char *get_progname(void);
+ 
+ #ifndef F_OK
+ #define F_OK 0
+ #endif
+ 
+ #ifndef O_ACCMODE
+ #define O_ACCMODE       003
+ #endif
+ 
+ #ifndef O_BINARY
+ #define O_BINARY        0
+ #endif
+ 
+ #ifdef HAVE_PATHS_H
+ #include <paths.h>
+ #endif
+ 
+ #ifndef _PATH_DEVNULL
+ #define _PATH_DEVNULL "/dev/null"
+ #endif
+ 
+ #ifndef MAXPATHLEN
+ #define MAXPATHLEN (1024+4)
+ #endif
+ 
+ 
+ #ifdef NEED_SELECT_PROTO
+ int
+ select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+        struct timeval *timeout);
+ #endif
+ 
+ #ifdef HAVE_REPAIRABLE_HTONL
+ #define htonl(x) __cpu_to_be32(x)
+ #define ntohl(x) __be32_to_cpu(x)
+ #define htons(x) __cpu_to_be16(x)
+ #define ntohs(x) __be16_to_cpu(x)
+ #endif
+ 
+ #if !defined(NSIG) && defined(_NSIG)
+ #define NSIG _NSIG
+ #endif
+ 
+ void *emalloc (size_t sz);
+ void *erealloc (void *ptr, size_t sz);
+ char *estrdup (const char *);
+ 
+ FILE *efopen(const char *name, const char *mode);
+ void efclose(FILE *);
+ size_t efread (void *ptr, size_t size, size_t nitems, FILE *stream);
+ size_t efwrite (const void *ptr, size_t size, size_t nitems, FILE *stream);
+ FILE *eepopen(const char *command, const char *type);
+ 
+   /* eefile */
+ 
+ struct _fileblob {
+   FILE *stream;
+   char *curname;
+   char *newname;
+ };
+ 
+ typedef struct _fileblob fileblob;
+ void eefopen(const char *name, const char *mode, fileblob *f);
+ void eefclose(fileblob *);
+ size_t eefread (void *ptr, size_t size, size_t nitems, fileblob *stream);
+ size_t eefwrite (const void *ptr, size_t size, size_t nitems,
+                  fileblob *stream);
+ 
+   /* copy_dirname */
+ 
+ char *copy_dirname (const char *s);
+ 
+   /* copy_basename */
+ 
+ char *copy_basename (const char *s);
+ 
+   /* strsplit */
+ 
+ int strsplit (char *str, char *pat, ...);
+ int vstrsplit (char *str, char *pat, unsigned nsub, char **sub);
+ 
+   /* strmatch */
+ 
+ int
+ strmatch (const char *pat, const char *str);
+ 
+   /* strtrim */
+ 
+ char *
+ strtrim (char *s_str);
+ 
+   /* timeval */
+ 
+ void timevalfix(struct timeval *t1);
+ void timevaladd(struct timeval *t1, const struct timeval *t2);
+ void timevalsub(struct timeval *t1, const struct timeval *t2);
  
  #ifdef __cplusplus
  }

-------------- next part --------------
A non-text attachment was scrubbed...
Name: bin00001.bin
Type: application/octet-stream
Size: 3722 bytes
Desc: "missing-files.tar.gz"
Url : http://lists.stacken.kth.se/pipermail/arla-drinkers/attachments/00000000/0f62cd3f/bin00001.bin