From: Wayne Davison <wayned@samba.org>
Date: Thu, 9 Nov 2006 02:50:26 +0000 (+0000)
Subject: Fixed failing hunk.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/c44bcb0dd0b2762e194c501066e6370d2bd52565

Fixed failing hunk.
---

diff --git a/fake-super.diff b/fake-super.diff
index 3f28e29..fe98e42 100644
--- a/fake-super.diff
+++ b/fake-super.diff
@@ -163,7 +163,7 @@ above:
  FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_BOOL(lp_list, list)
-@@ -816,7 +820,7 @@ BOOL lp_load(char *pszFname, int globals
+@@ -815,7 +819,7 @@ BOOL lp_load(char *pszFname, int globals
  
  	if (pszFname)
  	    pstrcpy(n2,pszFname);
@@ -258,7 +258,7 @@ above:
  				"failed to set permissions on %s",
 --- old/rsync.h
 +++ new/rsync.h
-@@ -707,6 +707,12 @@ typedef struct {
+@@ -704,6 +704,12 @@ typedef struct {
  
  #include "proto.h"
  
@@ -271,11 +271,10 @@ above:
  /* We have replacement versions of these if they're missing. */
  #ifndef HAVE_ASPRINTF
  int asprintf(char **ptr, const char *format, ...);
-@@ -924,3 +930,23 @@ int inet_pton(int af, const char *src, v
- #ifdef MAINTAINER_MODE
+@@ -922,6 +928,26 @@ int inet_pton(int af, const char *src, v
  const char *get_panic_action(void);
  #endif
-+
+ 
 +static inline int to_wire_mode(mode_t mode)
 +{
 +#ifdef SUPPORT_LINKS
@@ -295,6 +294,10 @@ above:
 +#endif
 +	return mode;
 +}
++
+ static inline int
+ isDigit(const char *ptr)
+ {
 --- old/rsync.yo
 +++ new/rsync.yo
 @@ -333,6 +333,7 @@ to the detailed description below for a