radmind-commit Mailing List for Radmind (Page 9)

Brought to you by: fitterhappier, shannahs, umeditor, uurazzle, wescraig

radmind-commit — CVS commit messages.

You can subscribe to this list here.

2006	Jan	Feb (52)	Mar (83)	Apr (37)	May (23)	Jun (9)	Jul (10)	Aug (30)	Sep (4)	Oct (9)	Nov (10)	Dec (7)
2007	Jan (3)	Feb (20)	Mar (3)	Apr	May (10)	Jun (17)	Jul (11)	Aug (6)	Sep (6)	Oct	Nov (15)	Dec (15)
2008	Jan (12)	Feb (1)	Mar (13)	Apr (7)	May (4)	Jun (37)	Jul (9)	Aug (7)	Sep	Oct	Nov	Dec (1)
2009	Jan (1)	Feb (11)	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct (1)	Nov	Dec
2010	Jan (3)	Feb (1)	Mar	Apr	May (2)	Jun (2)	Jul (1)	Aug	Sep	Oct (4)	Nov (6)	Dec (2)
2011	Jan (1)	Feb (1)	Mar	Apr	May	Jun (4)	Jul	Aug	Sep (3)	Oct (3)	Nov (6)	Dec
2012	Jan	Feb	Mar	Apr (1)	May (2)	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2014	Jan (3)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 7 8 9 10 11 .. 22 > >> (Page 9 of 22)

[Radmind-commit] radmind mkprefix.c,NONE,1.1 mkprefix.h,NONE,1.1

From: Patrick M. <ume...@us...> - 2007-07-11 11:30:38

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3754

Added Files:
	mkprefix.c mkprefix.h 
Log Message:
Added -C option to lapply that will create missing intermediate directories.


--- NEW FILE: mkprefix.h ---
/*
 * Copyright (c) 2003 Regents of The University of Michigan.
 * All Rights Reserved.  See COPYRIGHT.
 */

int mkprefix( char *path );

--- NEW FILE: mkprefix.c ---
/*
 * Copyright (c) 2003 Regents of The University of Michigan.
 * All Rights Reserved.  See COPYRIGHT.
 */

#include "config.h"

#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <sys/param.h>

#include "mkprefix.h"

int extern	quiet;
int extern	showprogress;

/* mkprefix attempts to create intermediate directories of path.
 * Intermediate directories are created with the permission of the
 * mode and UID of the last pre-existing parent directory. 
 */

    int 
mkprefix( char *path ) 
{
    char 	*p, parent_path[ MAXPATHLEN * 2 ];
    int		saved_errno, parent_stats = 0;
    uid_t	e_uid;
    struct stat	st, parent_st;
    mode_t	mode = 0777;

    e_uid = geteuid();

    /* Move past any leading /'s */
    for ( p = path; *p == '/'; p++ )
	;

    /* Attempt to create each intermediate directory of path */
    for ( p = strchr( p, '/' ); p != NULL; p = strchr( p, '/' )) {
	*p = '\0';
	if ( mkdir( path, mode ) < 0 ) {
	    /* Only error if path exists and it's not a directory */
	    saved_errno = errno;
	    if ( stat( path, &st ) != 0 ) {
		errno = saved_errno;
		return( -1 );
	    }
	    if ( !S_ISDIR( st.st_mode )) {
		errno = EEXIST;
		return( -1 );
	    }
	    errno = 0;
	    *p++ = '/';
	    continue;
	}

	/* Get stats from parent of first missing directory */
	if ( !parent_stats ) {
	    if ( snprintf( parent_path, MAXPATHLEN, "%s/..", path)
		    > MAXPATHLEN ) {
		fprintf( stderr, "%s/..: path too long\n", path );
		*p++ = '/';
		return( -1 );
	    }
	    if ( stat( parent_path, &parent_st ) != 0 ) {
		return( -1 );
	    }
	    parent_stats = 1;
	}

	/* Set mode to that of last preexisting parent */
	if ( mode != parent_st.st_mode ) {
	    if ( chmod( path, parent_st.st_mode ) != 0 ) {
		return( -1 );
	    }
	}

	/* Set uid to that of last preexisting parent */
	if ( e_uid != parent_st.st_uid ) {
	    if ( chown( path, parent_st.st_uid, parent_st.st_gid ) != 0 ) {
		return( -1 );
	    }
	}

	if ( !quiet && !showprogress ) {
	    printf( "%s: created missing prefix\n", path );
	}

	*p++ = '/';
    }
    return( 0 );
}

[Radmind-commit] radmind Makefile.in, 1.102, 1.103 ktcheck.c, 1.123, 1.124 lapply.c, 1.139, 1.140 lfdiff.c, 1.59, 1.60 retr.c, 1.58, 1.59 update.c, 1.46, 1.47

From: Patrick M. <ume...@us...> - 2007-07-11 03:01:46

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30643

Modified Files:
	Makefile.in ktcheck.c lapply.c lfdiff.c retr.c update.c 
Log Message:
Added -C option to lapply that will create missing intermediate directories.


Index: update.c
===================================================================
RCS file: /cvsroot/radmind/radmind/update.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** update.c	30 Nov 2004 18:44:06 -0000	1.46
--- update.c	11 Jul 2007 03:01:42 -0000	1.47
***************
*** 15,18 ****
--- 15,19 ----
  #include <sys/attr.h>
  #endif /* __APPLE__ */
+ #include <errno.h>
  #include <stdio.h>
  #include <stdlib.h>
***************
*** 28,35 ****
--- 29,38 ----
  #include "transcript.h"
  #include "progress.h"
+ #include "mkdirs.h"
  
  extern int quiet;
  extern int linenum;
  extern int showprogress;
+ extern int create_prefix;
  
      int
***************
*** 87,92 ****
  	if ( !present ) {
  	    if ( mkdir( path, mode ) != 0 ) {
! 		perror( path );
! 		return( 1 );
  	    }
  	    newfile = 1;
--- 90,107 ----
  	if ( !present ) {
  	    if ( mkdir( path, mode ) != 0 ) {
! 		if ( create_prefix && errno == ENOENT ) {
! 		    errno = 0;
! 		    if ( mkprefix( path ) != 0 ) {
! 			perror( path );
! 			return( 1 );
! 		    }
! 		    if ( mkdir( path, mode ) != 0 ) {
! 			perror( path );
! 			return( 1 );
! 		    }
! 		} else {
! 		    perror( path );
! 		    return( 1 );
! 		}
  	    }
  	    newfile = 1;
***************
*** 128,133 ****
  	} 
  	if ( link( d_target, path ) != 0 ) {
! 	    perror( path );
! 	    return( 1 );
  	}
  	if ( !quiet && !showprogress ) {
--- 143,160 ----
  	} 
  	if ( link( d_target, path ) != 0 ) {
! 	    if ( create_prefix && errno == ENOENT ) {
! 		errno = 0;
! 		if ( mkprefix( path ) != 0 ) {
! 		    perror( path );
! 		    return( 1 );
! 		}
! 		if ( link( d_target, path ) != 0 ) {
! 		    perror( path );
! 		    return( 1 );
! 		}
! 	    } else {
! 		perror( path );
! 		return( 1 );
! 	    }
  	}
  	if ( !quiet && !showprogress ) {
***************
*** 154,159 ****
  	} 
  	if ( symlink( d_target, path ) != 0 ) {
! 	    perror( path );
! 	    return( 1 );
  	}
  	if ( !quiet && !showprogress ) printf( "%s: symbolic linked to %s",
--- 181,198 ----
  	} 
  	if ( symlink( d_target, path ) != 0 ) {
! 	    if ( create_prefix && errno == ENOENT ) {
! 		errno = 0;
! 		if ( mkprefix( path ) != 0 ) {
! 		    perror( path );
! 		    return( 1 );
! 		}
! 		if ( symlink( d_target, path ) != 0 ) {
! 		    perror( path );
! 		    return( 1 );
! 		}
! 	    } else {
! 		perror( path );
! 		return( 1 );
! 	    }
  	}
  	if ( !quiet && !showprogress ) printf( "%s: symbolic linked to %s",
***************
*** 172,177 ****
  	if ( !present ) {
  	    if ( mkfifo( path, mode ) != 0 ){
! 		perror( path );
! 		return( 1 );
  	    }
  	    if ( lstat( path, st ) != 0 ) {
--- 211,228 ----
  	if ( !present ) {
  	    if ( mkfifo( path, mode ) != 0 ){
! 		if ( create_prefix && errno == ENOENT ) {
! 		    errno = 0;
! 		    if ( mkprefix( path ) != 0 ) {
! 			perror( path );
! 			return( 1 );
! 		    }
! 		    if ( mkfifo( path, mode ) != 0 ) {
! 			perror( path );
! 			return( 1 );
! 		    }
! 		} else {
! 		    perror( path );
! 		    return( 1 );
! 		}
  	    }
  	    if ( lstat( path, st ) != 0 ) {
***************
*** 221,226 ****
  
  	    if ( mknod( path, mode, dev ) != 0 ) {
! 		perror( path );
! 		return( 1 );
  	    }
  	    if ( lstat( path, st ) != 0 ) {
--- 272,289 ----
  
  	    if ( mknod( path, mode, dev ) != 0 ) {
! 		if ( create_prefix && errno == ENOENT ) {
! 		    errno = 0;
! 		    if ( mkprefix( path ) != 0 ) {
! 			perror( path );
! 			return( 1 );
! 		    }
! 		    if ( mknod( path, mode, dev ) != 0 ) {
! 			perror( path );
! 			return( 1 );
! 		    }
! 		} else {
! 		    perror( path );
! 		    return( 1 );
! 		}
  	    }
  	    if ( lstat( path, st ) != 0 ) {

Index: Makefile.in
===================================================================
RCS file: /cvsroot/radmind/radmind/Makefile.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** Makefile.in	18 Jun 2007 21:16:25 -0000	1.102
--- Makefile.in	11 Jul 2007 03:01:42 -0000	1.103
***************
*** 63,71 ****
  KTCHECK_OBJ=    version.o ktcheck.o argcargv.o retr.o base64.o code.o \
                  cksum.o list.o llist.o connect.o applefile.o tls.o pathcmp.o \
! 		progress.o mkdirs.o report.o rmdirs.o
  
  LAPPLY_OBJ=     version.o lapply.o argcargv.o code.o base64.o retr.o \
                  radstat.o update.o cksum.o connect.o pathcmp.o progress.o \
!                 applefile.o report.o tls.o
  
  LCREATE_OBJ=    version.o lcreate.o argcargv.o code.o connect.o progress.o \
--- 63,71 ----
  KTCHECK_OBJ=    version.o ktcheck.o argcargv.o retr.o base64.o code.o \
                  cksum.o list.o llist.o connect.o applefile.o tls.o pathcmp.o \
! 		progress.o mkdirs.o report.o rmdirs.o mkprefix.o
  
  LAPPLY_OBJ=     version.o lapply.o argcargv.o code.o base64.o retr.o \
                  radstat.o update.o cksum.o connect.o pathcmp.o progress.o \
!                 applefile.o report.o tls.o mkprefix.o
  
  LCREATE_OBJ=    version.o lcreate.o argcargv.o code.o connect.o progress.o \
***************
*** 80,84 ****
  LFDIFF_OBJ=     version.o lfdiff.o argcargv.o connect.o retr.o cksum.o \
                  progress.o base64.o applefile.o code.o tls.o pathcmp.o \
! 		transcript.o list.o radstat.o hardlink.o
  
  REPO_OBJ=	version.o repo.o report.o argcargv.o connect.o code.o tls.o
--- 80,84 ----
  LFDIFF_OBJ=     version.o lfdiff.o argcargv.o connect.o retr.o cksum.o \
                  progress.o base64.o applefile.o code.o tls.o pathcmp.o \
! 		transcript.o list.o radstat.o hardlink.o mkprefix.o
  
  REPO_OBJ=	version.o repo.o report.o argcargv.o connect.o code.o tls.o

Index: retr.c
===================================================================
RCS file: /cvsroot/radmind/radmind/retr.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** retr.c	6 May 2006 22:07:45 -0000	1.58
--- retr.c	11 Jul 2007 03:01:42 -0000	1.59
***************
*** 39,42 ****
--- 39,43 ----
  #include "largefile.h"
  #include "progress.h"
+ #include "mkprefix.h"
  
  extern void            (*logger)( char * );
***************
*** 48,51 ****
--- 49,53 ----
  extern int		cksum;
  extern int		errno;
+ extern int		create_prefix;
  extern SSL_CTX  	*ctx;
  
***************
*** 120,124 ****
  	return( -1 );
      }
-     if ( verbose ) printf( "<<< " );
  
      /*Create temp file name*/
--- 122,125 ----
***************
*** 131,138 ****
      /* Open file */
      if (( fd = open( temppath, O_WRONLY | O_CREAT, tempmode )) < 0 ) {
! 	perror( temppath );
! 	return( -1 );
      }
  
      /* Get file from server */
      while ( size > 0 ) {
--- 132,153 ----
      /* Open file */
      if (( fd = open( temppath, O_WRONLY | O_CREAT, tempmode )) < 0 ) {
! 	if ( create_prefix && errno == ENOENT ) {
! 	    errno = 0;
! 	    if ( mkprefix( temppath ) != 0 ) {
! 		perror( temppath );
! 		return( -1 );
! 	    }
! 	    if (( fd = open( temppath, O_WRONLY | O_CREAT, tempmode )) < 0 ) {
! 		perror( temppath );
! 		return( -1 );
! 	    }
! 	} else {
! 	    perror( temppath );
! 	    return( -1 );
! 	}
      }
  
+     if ( verbose ) printf( "<<< " );
+ 
      /* Get file from server */
      while ( size > 0 ) {
***************
*** 279,283 ****
  	return( -1 );
      }  
-     if ( verbose ) printf( "<<< " );
      if ( size < ( AS_HEADERLEN + ( 3 * sizeof( struct as_entry )) +
  	    FINFOLEN )) {
--- 294,297 ----
***************
*** 305,308 ****
--- 319,351 ----
  	EVP_DigestUpdate( &mdctx, (char *)&ah, (unsigned int)rc );
      }
+ 
+     /* name temp file */
+     if ( snprintf( temppath, MAXPATHLEN, "%s.radmind.%i", path,
+ 	    getpid()) >= MAXPATHLEN ) {
+ 	fprintf( stderr, "%s.radmind.%i: too long", path, ( int )getpid());
+ 	return( -1 );
+     }
+ 
+     /* data fork must exist to write to rsrc fork */        
+     /* Open here so messages from mkprefix don't verbose dots */
+     if (( dfd = open( temppath, O_CREAT | O_EXCL | O_WRONLY, tempmode )) < 0 ) {
+ 	if ( create_prefix && errno == ENOENT ) {
+ 	    errno = 0;
+ 	    if ( mkprefix( temppath ) != 0 ) {
+ 		perror( temppath );
+ 		return( -1 );
+ 	    }
+ 	    if (( dfd = open( temppath, O_CREAT | O_EXCL | O_WRONLY,
+ 		    tempmode )) < 0 ) {
+ 		perror( temppath );
+ 		return( -1 );
+ 	    }
+ 	} else {
+ 	    perror( temppath );
+ 	    return( -1 );
+ 	}
+     }
+ 
+     if ( verbose ) printf( "<<< " );
      if ( dodots ) { putc( '.', stdout ); fflush( stdout ); }
      size -= rc;
***************
*** 317,321 ****
  	fprintf( stderr, "retrieve applefile %s failed: 5-%s\n", pathdesc,
  	    strerror( errno ));
! 	return( -1 );
      }
      if ( rc != ( 3 * sizeof( struct as_entry ))) {
--- 360,365 ----
  	fprintf( stderr, "retrieve applefile %s failed: 5-%s\n", pathdesc,
  	    strerror( errno ));
! 	returnval = -1;
! 	goto error2;
      }
      if ( rc != ( 3 * sizeof( struct as_entry ))) {
***************
*** 323,327 ****
  	    "retrieve applefile %s failed: corrupt AppleSingle-encoded file\n",
  	    path );
! 	return( -1 );
      }
  
--- 367,372 ----
  	    "retrieve applefile %s failed: corrupt AppleSingle-encoded file\n",
  	    path );
! 	returnval = -1;
! 	goto error2;
      }
  
***************
*** 343,347 ****
  	fprintf( stderr, "retrieve applefile %s failed: 6-%s\n", pathdesc,
  	    strerror( errno ));
! 	return( -1 );
      }
      if ( rc != FINFOLEN ) {
--- 388,393 ----
  	fprintf( stderr, "retrieve applefile %s failed: 6-%s\n", pathdesc,
  	    strerror( errno ));
! 	returnval = -1;
! 	goto error2;
      }
      if ( rc != FINFOLEN ) {
***************
*** 349,353 ****
  	    "retrieve applefile %s failed: corrupt AppleSingle-encoded file\n",
  	    path );
! 	return( -1 );
      }
      if ( cksum ) {
--- 395,400 ----
  	    "retrieve applefile %s failed: corrupt AppleSingle-encoded file\n",
  	    path );
! 	returnval = -1;
! 	goto error2;
      }
      if ( cksum ) {
***************
*** 360,376 ****
      }
  
-     /* name temp file */
-     if ( snprintf( temppath, MAXPATHLEN, "%s.radmind.%i", path,
- 	    getpid()) >= MAXPATHLEN ) {
- 	fprintf( stderr, "%s.radmind.%i: too long", path, ( int )getpid());
- 	return( -1 );
-     }
- 
-     /* data fork must exist to write to rsrc fork */        
-     if (( dfd = open( temppath, O_CREAT | O_EXCL | O_WRONLY, tempmode )) < 0 ) {
- 	perror( temppath );
- 	return( -1 );
-     }
- 
      /*
       * endian handling: swap bytes to architecture
--- 407,410 ----
***************
*** 392,400 ****
  	}
  
  	if (( rfd = open( rsrc_path, O_WRONLY, 0 )) < 0 ) {
  	    perror( rsrc_path );
  	    returnval = -1;
  	    goto error2;
! 	};  
  
  	for ( rsize = ae_ents[ AS_RFE ].ae_length;
--- 426,435 ----
  	}
  
+ 	/* No need to mkprefix as dfd is already present */
  	if (( rfd = open( rsrc_path, O_WRONLY, 0 )) < 0 ) {
  	    perror( rsrc_path );
  	    returnval = -1;
  	    goto error2;
! 	}
  
  	for ( rsize = ae_ents[ AS_RFE ].ae_length;

Index: ktcheck.c
===================================================================
RCS file: /cvsroot/radmind/radmind/ktcheck.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** ktcheck.c	18 Jun 2007 19:40:05 -0000	1.123
--- ktcheck.c	11 Jul 2007 03:01:42 -0000	1.124
***************
*** 48,51 ****
--- 48,52 ----
  #include "rmdirs.h"
  #include "report.h"
+ #include "mkprefix.h"
  
  int cleandirs( char *path, struct llist *khead );
***************
*** 67,70 ****
--- 68,72 ----
  int			case_sensitive = 1;
  int			report = 1;
+ int			create_prefix = 0;
  char			*base_kfile= _RADMIND_COMMANDFILE;
  char			*radmind_path = _RADMIND_PATH;

Index: lapply.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lapply.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** lapply.c	11 Jul 2007 02:59:43 -0000	1.139
--- lapply.c	11 Jul 2007 03:01:42 -0000	1.140
***************
*** 55,58 ****
--- 55,59 ----
  int		case_sensitive = 1;
  int		report = 1;
+ int		create_prefix = 0;
  char		transcript[ 2 * MAXPATHLEN ] = { 0 };
  char		prepath[ MAXPATHLEN ]  = { 0 };
***************
*** 252,256 ****
  	char        **capa = NULL; /* capabilities */
  
!     while (( c = getopt ( argc, argv, "%c:Fh:iInp:qru:Vvw:x:y:z:Z:" )) != EOF ) {
  	switch( c ) {
  	case '%':
--- 253,258 ----
  	char        **capa = NULL; /* capabilities */
  
!     while (( c = getopt( argc, argv,
! 	    "%c:CFh:iInp:qru:Vvw:x:y:z:Z:" )) != EOF ) {
  	switch( c ) {
  	case '%':
***************
*** 268,271 ****
--- 270,277 ----
              break;
  
+ 	case 'C':
+ 	    create_prefix = 1;
+ 	    break;
+ 
  	case 'F':
  	    force = 1;
***************
*** 394,398 ****
  
      if ( err ) {
! 	fprintf( stderr, "usage: %s [ -FiInrV ] [ -%% | -q | -v ] ",
  	    argv[ 0 ] );
  	fprintf( stderr, "[ -c checksum ] [ -h host ] [ -p port ] " );
--- 400,404 ----
  
      if ( err ) {
! 	fprintf( stderr, "usage: %s [ -CFiInrV ] [ -%% | -q | -v ] ",
  	    argv[ 0 ] );
  	fprintf( stderr, "[ -c checksum ] [ -h host ] [ -p port ] " );

Index: lfdiff.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lfdiff.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** lfdiff.c	18 Jun 2007 19:40:05 -0000	1.59
--- lfdiff.c	11 Jul 2007 03:01:42 -0000	1.60
***************
*** 46,49 ****
--- 46,51 ----
  int			cksum = 0;
  int             	case_sensitive = 1;
+ int			create_prefix = 0;
+ int			quiet = 1;
  const EVP_MD    	*md;
  SSL_CTX  		*ctx;

[Radmind-commit] radmind/man lapply.1,1.16,1.17

From: Patrick M. <ume...@us...> - 2007-07-11 03:01:46

Update of /cvsroot/radmind/radmind/man
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30643/man

Modified Files:
	lapply.1 
Log Message:
Added -C option to lapply that will create missing intermediate directories.


Index: lapply.1
===================================================================
RCS file: /cvsroot/radmind/radmind/man/lapply.1,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** lapply.1	26 Mar 2007 18:56:53 -0000	1.16
--- lapply.1	11 Jul 2007 03:01:43 -0000	1.17
***************
*** 5,9 ****
  .SH SYNOPSIS
  .B lapply
! .RB [ \-FiInrV ]
  [
  .RB \-%\ |\ \-q\ |\ \-v
--- 5,9 ----
  .SH SYNOPSIS
  .B lapply
! .RB [ \-CFiInrV ]
  [
  .RB \-%\ |\ \-q\ |\ \-v
***************
*** 43,51 ****
  the transcript line.  File system objects marked with a "-" are removed.
  Other transcript lines indicate that a file system
! object must be modified or created if missing.  lapply is not able to create doors or sockets.
  .sp
  File system objects listed in the transcript and present in the
  file system as a different type are automatically removed.
  .sp
  The radmind tools are unaware of user defined file flags, some of which
  may prevent lapply from successfully completing.  Using the -F option,
--- 43,61 ----
  the transcript line.  File system objects marked with a "-" are removed.
  Other transcript lines indicate that a file system
! object must be modified or created if missing.  lapply is not able to create
! doors or sockets.
  .sp
  File system objects listed in the transcript and present in the
  file system as a different type are automatically removed.
  .sp
+ By default,
+ .B lapply
+ will exit with an error if an object's full path is not present on the file
+ system.  When run with the -C option,
+ .B lapply
+ will attempt to create any intermediate directories that are missing. 
+ Intermediated directories inherit the owner, group and permissions of its
+ parent directory.
+ .sp
  The radmind tools are unaware of user defined file flags, some of which
  may prevent lapply from successfully completing.  Using the -F option,
***************
*** 74,77 ****
--- 84,90 ----
  enables checksuming.
  .TP 19
+ .BI \-C
+ create missing intermediate directories.
+ .TP 19
  .BI \-h\  host
  specifies the radmind server, by default

[Radmind-commit] radmind lapply.c,1.138,1.139

From: Patrick M. <ume...@us...> - 2007-07-11 02:59:50

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30208

Modified Files:
	lapply.c 
Log Message:
Removed unset string from error message.


Index: lapply.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lapply.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** lapply.c	18 Jun 2007 19:40:05 -0000	1.138
--- lapply.c	11 Jul 2007 02:59:43 -0000	1.139
***************
*** 521,526 ****
  	if ( prepath != 0 ) {
  	    if ( pathcasecmp( path, prepath, case_sensitive ) < 0 ) {
! 		fprintf( stderr, "%s: line %d: bad sort order\n",
! 			    transcript, linenum );
  		goto error2;
  	    }
--- 521,525 ----
  	if ( prepath != 0 ) {
  	    if ( pathcasecmp( path, prepath, case_sensitive ) < 0 ) {
! 		fprintf( stderr, "line %d: bad sort order\n", linenum );
  		goto error2;
  	    }

[Radmind-commit] radmind/man fsdiff.1,1.12,1.13

From: Patrick M. <ume...@us...> - 2007-07-05 19:39:05

Update of /cvsroot/radmind/radmind/man
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10583

Modified Files:
	fsdiff.1 
Log Message:
Added information on minus lines.


Index: fsdiff.1
===================================================================
RCS file: /cvsroot/radmind/radmind/man/fsdiff.1,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** fsdiff.1	14 Jun 2005 14:13:54 -0000	1.12
--- fsdiff.1	5 Jul 2007 19:38:59 -0000	1.13
***************
*** 187,191 ****
  .br
  .sp
! # example command file
  .br
  	k	linux-base.K
--- 187,191 ----
  .br
  .sp
! 	# example command file
  .br
  	k	linux-base.K
***************
*** 208,211 ****
--- 208,234 ----
  filesystem, eg. a filesystem snapshot. 
  .sp
+ Positive and negative transcripts and special files can be removed from a command file by using minus lines.  These lines effectively remove all previously  referenced lines that match both the type and path of the minus line.  Minus lines begin with a '-', followed by some amount of whitespace.
+ .sp
+ Minus lines only apply to transcripts and special files that have already been read from a command file.  If a subsequent line or included command file lists the same transcript or special file, it will be once again included.
+ .sp
+ For example, if you wanted to remove the special file /etc/fstab from the previous example, you could use this command file:
+ .br
+ .br
+ .sp
+ 	# example command file
+ .br
+ 	k	linux-base.K
+ .br
+ 	p	test/denser-10.T
+ .br
+ 	p	simta-032.T
+ .br
+ 	n	simta-neg.T
+ .br
+ 	s	/etc/fstab
+ .br
+ 	-  s	/etc/fstab
+ .sp
+ The minus line in this example would match the special file /etc/fstab, causing it to be effectively removed from the command file.
  .SH EXAMPLES
  In this example, fsdiff is used to generate a line for the negative

[Radmind-commit] radmind-assistant/rte/filters Applications.transcriptFilter, NONE, 1.1 DS_Store.transcriptFilter, NONE, 1.1 Non-Root Owners.transcriptFilter, NONE, 1.1

From: Andrew M. <fit...@us...> - 2007-06-24 23:45:36

Update of /cvsroot/radmind/radmind-assistant/rte/filters
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17998/filters

Added Files:
	Applications.transcriptFilter DS_Store.transcriptFilter 
	Non-Root Owners.transcriptFilter 
Log Message:
Basic filters included with RTE.


--- NEW FILE: Non-Root Owners.transcriptFilter ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>filterName</key>
	<string>Non-Root Owners</string>
	<key>negateBoolean</key>
	<true/>
	<key>owner</key>
	<string>0</string>
</dict>
</plist>

--- NEW FILE: Applications.transcriptFilter ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>filterName</key>
	<string>Applications</string>
	<key>negateBoolean</key>
	<true/>
	<key>path</key>
	<string>*.app</string>
</dict>
</plist>

--- NEW FILE: DS_Store.transcriptFilter ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>filterName</key>
	<string>DS_Store</string>
	<key>path</key>
	<string>*.DS_Store</string>
</dict>
</plist>

[Radmind-commit] radmind-assistant/rte/filters - New directory

From: Andrew M. <fit...@us...> - 2007-06-24 23:44:48

Update of /cvsroot/radmind/radmind-assistant/rte/filters
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17596/filters

Log Message:
Directory /cvsroot/radmind/radmind-assistant/rte/filters added to the repository

[Radmind-commit] radmind-assistant/rte RXTranscript.m,1.111,1.112

From: Andrew M. <fit...@us...> - 2007-06-24 23:11:48

Update of /cvsroot/radmind/radmind-assistant/rte
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4792

Modified Files:
	RXTranscript.m 
Log Message:
Copy/paste works again.
Restored tableview data source methods until I have time to work on version using bindings.


Index: RXTranscript.m
===================================================================
RCS file: /cvsroot/radmind/radmind-assistant/rte/RXTranscript.m,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** RXTranscript.m	29 Aug 2006 01:32:00 -0000	1.111
--- RXTranscript.m	24 Jun 2007 23:11:43 -0000	1.112
***************
*** 423,426 ****
--- 423,428 ----
      NSMutableArray	*transcriptObjects = transcriptLines;
      NSMutableArray	*searchCopy = nil;
+     NSMutableIndexSet	*searchIndexes;
+     unsigned int	i;
      
      if ( searchResults != nil ) {
***************
*** 443,448 ****
  	    return;
  	}
! 
! 	[[ self transcriptContents ] removeObjectsInArray: transcriptObjects ];
  	transcriptObjects = searchResults;
      }
--- 445,459 ----
  	    return;
  	}
! 	
! 	searchIndexes = [[ NSMutableIndexSet alloc ] init ];
! 	for ( i = 0; i < [ transcriptObjects count ]; i++ ) {
! 	    [ searchIndexes addIndex: [[[ transcriptObjects objectAtIndex: i ]
! 		    objectForKey: @"tindex" ] intValue ]];
! 	}
! 	if ( [ searchIndexes count ] > 0 ) {
! 	    [[ self transcriptContents ] removeObjectsAtIndexes: searchIndexes ];
! 	}
! 	[ searchIndexes release ];
! 	
  	transcriptObjects = searchResults;
      }
***************
*** 517,530 ****
  	NSIndexSet	*indexes = [ tContentsTableView selectedRowIndexes ];
  	
! 	copiedlines = [ NSMutableArray arrayWithCapacity: [ indexes count ]];
  	[ copiedlines addObjectsFromArray:
  		[[ self displayedTranscriptContents ]
  		objectsAtIndexes: indexes ]];
! 		
  	pb = [ NSPasteboard generalPasteboard ];
  	[ pb declareTypes:
  		[ NSArray arrayWithObject: RTETranscriptContentsPboardType ]
  		owner: self ];
! 	[ pb setPropertyList: copiedlines forType: RTETranscriptContentsPboardType ];
      } else {
          if ( [[ tWindow firstResponder ] respondsToSelector: @selector( copy: ) ] ) {
--- 528,544 ----
  	NSIndexSet	*indexes = [ tContentsTableView selectedRowIndexes ];
  	
! 	copiedlines = [[ NSMutableArray alloc ] initWithCapacity: [ indexes count ]];
  	[ copiedlines addObjectsFromArray:
  		[[ self displayedTranscriptContents ]
  		objectsAtIndexes: indexes ]];
! 
  	pb = [ NSPasteboard generalPasteboard ];
  	[ pb declareTypes:
  		[ NSArray arrayWithObject: RTETranscriptContentsPboardType ]
  		owner: self ];
! 
! 	[ pb setData: [ NSArchiver archivedDataWithRootObject: copiedlines ]
! 			forType: RTETranscriptContentsPboardType ];
! 	[ copiedlines release ];
      } else {
          if ( [[ tWindow firstResponder ] respondsToSelector: @selector( copy: ) ] ) {
***************
*** 560,564 ****
  					[ NSArray arrayWithObject:
  					RTETranscriptContentsPboardType ]];
!     id			    pasteContents = nil;
      NSMutableArray	    *lines;
  
--- 574,579 ----
  					[ NSArray arrayWithObject:
  					RTETranscriptContentsPboardType ]];
!     NSData		    *pasteData;
!     id			    pasteContents;
      NSMutableArray	    *lines;
  
***************
*** 570,574 ****
  	    }
  
! 	    pasteContents = [ pb propertyListForType: RTETranscriptContentsPboardType ];
  	    
              if ( [ self transcriptContents ] == nil ) {
--- 585,594 ----
  	    }
  
! 	    pasteData = [ pb dataForType: type ];
! 	    pasteContents = [ NSUnarchiver unarchiveObjectWithData: pasteData ];
! 	    if ( pasteContents == nil ) {
! 		NSBeep();
! 		return;
! 	    }
  	    
              if ( [ self transcriptContents ] == nil ) {
***************
*** 599,603 ****
      }
  	
!     //[ tContentsTableView reloadData ];
      [ tWindow setDocumentEdited: YES ];
  }
--- 619,623 ----
      }
  	
!     [ tContentsTableView reloadData ];
      [ tWindow setDocumentEdited: YES ];
  }
***************
*** 988,995 ****
  
      filter = [[[ RTEFilter alloc ] init ] autorelease ];
      filteredTranscript = [ filter filterTranscript: [ self transcriptContents ]
  	withFilterPatterns: [ NSArray arrayWithObject: filterDictionary ]];
       
!     /* XXX add undo invocation */
      [ self setTranscriptContents: filteredTranscript ];
      [ self setDisplayedTranscriptContents: [ self transcriptContents ]];
--- 1008,1018 ----
  
      filter = [[[ RTEFilter alloc ] init ] autorelease ];
+     /* XXX faster to do with NSIndexSet? */
      filteredTranscript = [ filter filterTranscript: [ self transcriptContents ]
  	withFilterPatterns: [ NSArray arrayWithObject: filterDictionary ]];
       
!     [[ self undoManager ] registerUndoWithTarget: self
! 	    selector: @selector( setTranscriptContents: )
! 	    object: [ self transcriptContents ]];
      [ self setTranscriptContents: filteredTranscript ];
      [ self setDisplayedTranscriptContents: [ self transcriptContents ]];
***************
*** 2445,2448 ****
--- 2468,2498 ----
  
  /* tableview data source methods */
+ - ( int )numberOfRowsInTableView: ( NSTableView * )aTableView
+ {
+     int			count = [[ self displayedTranscriptContents ] count ];
+ 
+     return( count );
+ }
+ 
+ - ( id )tableView: ( NSTableView * )aTableView
+         objectValueForTableColumn: ( NSTableColumn * )aTableColumn
+         row: ( int )rowIndex
+ {
+     NSMutableArray	*lines = [ self displayedTranscriptContents ];
+ 
+     if ( [[ aTableColumn identifier ] isEqualToString: @"Path" ] ) {
+         NSString            *path = [[ lines objectAtIndex: rowIndex ] objectForKey: @"path" ];
+         NSAttributedString  *attrString = [[[ NSAttributedString alloc ] initWithString: path ] autorelease ];
+         double              width = [ aTableColumn width ];
+ 
+         attrString = [ attrString ellipsisAbbreviatedStringForWidth: width ];
+         
+         return( attrString );
+     }
+     
+     /* rest handled by willDisplayCell: */
+     return( @"" );
+ }
+ 
  - ( void )tableView: ( NSTableView * )tableView willDisplayCell: ( id )aCell
          forTableColumn: ( NSTableColumn * )aTableColumn row: ( int )rowIndex

[Radmind-commit] radmind Makefile.in,1.101,1.102

From: Patrick M. <ume...@us...> - 2007-06-18 21:16:28

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25138

Modified Files:
	Makefile.in 
Log Message:
Using correct variable name when substituting path to echo.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/radmind/radmind/Makefile.in,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** Makefile.in	23 May 2007 18:33:45 -0000	1.101
--- Makefile.in	18 Jun 2007 21:16:25 -0000	1.102
***************
*** 254,258 ****
  	    -e 's@_RADMIND_COMMANDFILE@${COMMANDFILE}@g' \
  	    -e 's@_RADMIND_VERSION@$(shell cat VERSION)@g' \
! 	    -e 's@_RADMIND_ECHO_PATH@${ECHOPATH}@g' \
  	    ${srcdir}/ra.sh > tmp/ra.sh; 
  
--- 254,258 ----
  	    -e 's@_RADMIND_COMMANDFILE@${COMMANDFILE}@g' \
  	    -e 's@_RADMIND_VERSION@$(shell cat VERSION)@g' \
! 	    -e 's@_RADMIND_ECHO_PATH@${ECHO}@g' \
  	    ${srcdir}/ra.sh > tmp/ra.sh;

[Radmind-commit] radmind aclocal.m4, 1.16, 1.17 config.h.in, 1.9, 1.10 configure, 1.51, 1.52 configure.ac, 1.41, 1.42 daemon.c, 1.81, 1.82 ktcheck.c, 1.122, 1.123 lapply.c, 1.137, 1.138 largefile.h, 1.6, 1.7 lcreate.c, 1.87, 1.88 lfdiff.c, 1.58, 1.59 repo.c, 1.9, 1.10

From: Patrick M. <ume...@us...> - 2007-06-18 19:40:12

Update of /cvsroot/radmind/radmind
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15907

Modified Files:
	aclocal.m4 config.h.in configure configure.ac daemon.c 
	ktcheck.c lapply.c largefile.h lcreate.c lfdiff.c repo.c 
Log Message:
A port to HP/UX.
Thanks to Jim Foraker for the patch.  [ PATCH 1733645 ]
Changes include:
* no wait4(), so emulated with wait3(). Another option would be to
just use wait3() on all platforms, since the extra arg of wait4() isn't
currently being used.
* check for strtoll() and use strtol if it doesn't exist, even if off_t
is 64-bit. Some people have used __strtoll() on HP/UX, but in radmind it's
only used for progress reporting, so it didn't seem worth it to use an
unapproved function.
* use = instead of == in aclocal, since HP/UX /bin/sh doesn't support
that test
* define _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED=1 on HP/UX. This not
only fixes a bunch of prototypes, but is necessary to get gcc to
successfully parse the HP/UX includes.
* #include <arpa/inet.h> a few places it probably should have been
anyways, for hton* and ntoh*.
threw in a cast in repo.c to fix a compiler warning probably occuring
on multiple platforms.


Index: config.h.in
===================================================================
RCS file: /cvsroot/radmind/radmind/config.h.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** config.h.in	22 Sep 2006 20:44:41 -0000	1.9
--- config.h.in	18 Jun 2007 19:40:05 -0000	1.10
***************
*** 29,32 ****
--- 29,35 ----
  #undef HAVE_ZLIB
  
+ #undef HAVE_WAIT4
+ #undef HAVE_STRTOLL
+ 
  #ifndef MIN
  #define MIN(a,b)        ((a)<(b)?(a):(b))

Index: configure
===================================================================
RCS file: /cvsroot/radmind/radmind/configure,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** configure	23 May 2007 18:33:45 -0000	1.51
--- configure	18 Jun 2007 19:40:05 -0000	1.52
***************
*** 5416,5420 ****
  		fi
  	done
! 	if test x_$found_zlib == x_yes; then
  		if test "$dir" != "/usr"; then
  			CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
--- 5416,5420 ----
  		fi
  	done
! 	if test x_$found_zlib = x_yes; then
  		if test "$dir" != "/usr"; then
  			CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
***************
*** 5440,5446 ****
  
  
  # Miscellaneous:
! if test x_$GCC = x_yes; then
!     OPTOPTS=${OPTOPTS:-"-Wall -Wmissing-prototypes"}
  fi
  
--- 5440,5556 ----
  
  
+ # HPUX lacks wait4 and strtoll
+ 
+ 
+ for ac_func in wait4 strtoll
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+ #define $ac_func innocuous_$ac_func
+ 
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.
+     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+     <limits.h> exists even on freestanding compilers.  */
+ 
+ #ifdef __STDC__
+ # include <limits.h>
+ #else
+ # include <assert.h>
+ #endif
+ 
+ #undef $ac_func
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ {
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ char (*f) () = $ac_func;
+ #endif
+ #ifdef __cplusplus
+ }
+ #endif
+ 
+ int
+ main ()
+ {
+ return f != $ac_func;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+ 	 { ac_try='test -z "$ac_c_werror_flag"
+ 			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ eval "$as_ac_var=no"
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
  # Miscellaneous:
! if test x_$OPTOPTS = x_; then
!     if test x_$GCC = x_yes; then
!         OPTOPTS="$OPTOPTS -Wall -Wmissing-prototypes"
!     fi
!     if test x_$build_vendor = x_hp; then
!         OPTOPTS="$OPTOPTS -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
!     fi
  fi
  

Index: daemon.c
===================================================================
RCS file: /cvsroot/radmind/radmind/daemon.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** daemon.c	25 May 2007 02:47:20 -0000	1.81
--- daemon.c	18 Jun 2007 19:40:05 -0000	1.82
***************
*** 479,483 ****
--- 479,487 ----
  	    child_signal = 0;
  	    /* check to see if any children need to be accounted for */
+ #ifdef HAVE_WAIT4
  	    while (( pid = wait4( 0, &status, WNOHANG, &usage )) > 0 ) {
+ #else
+             while (( pid = wait3(&status, WNOHANG, &usage )) > 0 ) {
+ #endif
  		connections--;
  

Index: lcreate.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lcreate.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** lcreate.c	13 Oct 2006 20:20:20 -0000	1.87
--- lcreate.c	18 Jun 2007 19:40:05 -0000	1.88
***************
*** 11,14 ****
--- 11,15 ----
  #include <sys/time.h>
  #include <netinet/in.h>
+ #include <arpa/inet.h>
  #include <errno.h>
  #include <fcntl.h>

Index: configure.ac
===================================================================
RCS file: /cvsroot/radmind/radmind/configure.ac,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** configure.ac	23 May 2007 18:33:45 -0000	1.41
--- configure.ac	18 Jun 2007 19:40:05 -0000	1.42
***************
*** 73,79 ****
  CHECK_ZLIB
  
  # Miscellaneous:
! if test x_$GCC = x_yes; then
!     OPTOPTS=${OPTOPTS:-"-Wall -Wmissing-prototypes"}
  fi
  AC_SUBST(OPTOPTS)
--- 73,87 ----
  CHECK_ZLIB
  
+ # HPUX lacks wait4 and strtoll
+ AC_CHECK_FUNCS(wait4 strtoll)
+ 
  # Miscellaneous:
! if test x_$OPTOPTS = x_; then
!     if test x_$GCC = x_yes; then
!         OPTOPTS="$OPTOPTS -Wall -Wmissing-prototypes"
!     fi
!     if test x_$build_vendor = x_hp; then
!         OPTOPTS="$OPTOPTS -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
!     fi
  fi
  AC_SUBST(OPTOPTS)

Index: repo.c
===================================================================
RCS file: /cvsroot/radmind/radmind/repo.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** repo.c	27 Feb 2007 15:33:00 -0000	1.9
--- repo.c	18 Jun 2007 19:40:05 -0000	1.10
***************
*** 10,13 ****
--- 10,14 ----
  #include <sys/time.h>
  #include <netinet/in.h>
+ #include <arpa/inet.h>
  #include <ctype.h>
  #include <netdb.h>
***************
*** 135,139 ****
  	} else {
  	    for ( i = 0; i < len; i++ ) {
! 		if ( isspace( event[ i ] )) {
  		    err++;
  		    break;
--- 136,140 ----
  	} else {
  	    for ( i = 0; i < len; i++ ) {
! 		if ( isspace( (int)event[ i ] )) {
  		    err++;
  		    break;

Index: ktcheck.c
===================================================================
RCS file: /cvsroot/radmind/radmind/ktcheck.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** ktcheck.c	31 May 2007 20:47:16 -0000	1.122
--- ktcheck.c	18 Jun 2007 19:40:05 -0000	1.123
***************
*** 11,14 ****
--- 11,15 ----
  #include <sys/time.h>
  #include <netinet/in.h>
+ #include <arpa/inet.h>
  #include <dirent.h>
  #include <fcntl.h>

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/radmind/radmind/aclocal.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** aclocal.m4	1 Aug 2006 16:48:05 -0000	1.16
--- aclocal.m4	18 Jun 2007 19:40:05 -0000	1.17
***************
*** 70,74 ****
  		fi
  	done
! 	if test x_$found_zlib == x_yes; then
  		if test "$dir" != "/usr"; then
  			CPPFLAGS="$CPPFLAGS -I$zlibdir/include";
--- 70,74 ----
  		fi
  	done
! 	if test x_$found_zlib = x_yes; then
  		if test "$dir" != "/usr"; then
  			CPPFLAGS="$CPPFLAGS -I$zlibdir/include";

Index: lapply.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lapply.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** lapply.c	18 May 2007 19:10:27 -0000	1.137
--- lapply.c	18 Jun 2007 19:40:05 -0000	1.138
***************
*** 10,13 ****
--- 10,14 ----
  #include <sys/param.h>
  #include <netinet/in.h>
+ #include <arpa/inet.h>
  #include <errno.h>
  #include <netdb.h>

Index: lfdiff.c
===================================================================
RCS file: /cvsroot/radmind/radmind/lfdiff.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** lfdiff.c	13 Oct 2006 20:20:20 -0000	1.58
--- lfdiff.c	18 Jun 2007 19:40:05 -0000	1.59
***************
*** 11,14 ****
--- 11,15 ----
  #include <sys/param.h>
  #include <netinet/in.h>
+ #include <arpa/inet.h>
  #include <fcntl.h>
  #include <netdb.h>

Index: largefile.h
===================================================================
RCS file: /cvsroot/radmind/radmind/largefile.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** largefile.h	20 Sep 2004 04:50:59 -0000	1.6
--- largefile.h	18 Jun 2007 19:40:05 -0000	1.7
***************
*** 9,13 ****
  
  #if SIZEOF_OFF_T == 8
! #define strtoofft(x,y,z)	(strtoll((x),(y),(z)))
  #define PRIofft			"ll"
  #else	/* a bit of an assumption, here */
--- 9,17 ----
  
  #if SIZEOF_OFF_T == 8
!     #ifdef HAVE_STRTOLL
!     #define strtoofft(x,y,z)	(strtoll((x),(y),(z)))
!     #else
!     #define strtoofft(x,y,z)        (strtol((x),(y),(z)))
!     #endif
  #define PRIofft			"ll"
  #else	/* a bit of an assumption, here */

[Radmind-commit] radmind-pc/fs chksum.c, 1.6, 1.7 connect.c, 1.3, 1.4 ktcheck.c, 1.6, 1.7 ktcheck.vcproj, 1.2, 1.3 lapply.c, 1.7, 1.8 lapply.vcproj, 1.2, 1.3 lcreate.c, 1.2, 1.3 lcreate.vcproj, 1.2, 1.3 ntfsdiff.c, 1.23, 1.24 ntfsdiff.vcproj, 1.2, 1.3 pathcmp.c, 1.1, 1.2 retr.c, 1.3, 1.4 stor.c, 1.1, 1.2 transcript.c, 1.16, 1.17