Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Mention that "%o" can now have the value "del."
[rsync/rsync.git]
/
progress.c
diff --git
a/progress.c
b/progress.c
index
cda9178
..
22e0955
100644
(file)
--- a/
progress.c
+++ b/
progress.c
@@
-26,7
+26,7
@@
extern int am_server;
#define PROGRESS_HISTORY_SECS 5
#define PROGRESS_HISTORY_SECS 5
-#if GETPGRP_VOID
+#if
def
GETPGRP_VOID
#define GETPGRP_ARG
#else
#define GETPGRP_ARG 0
#define GETPGRP_ARG
#else
#define GETPGRP_ARG 0
@@
-121,7
+121,7
@@
void end_progress(OFF_T size)
void show_progress(OFF_T ofs, OFF_T size)
{
struct timeval now;
void show_progress(OFF_T ofs, OFF_T size)
{
struct timeval now;
-#if
HAVE_GETPGRP &&
HAVE_TCGETPGRP
+#if
defined HAVE_GETPGRP && defined
HAVE_TCGETPGRP
static pid_t pgrp = -1;
pid_t tc_pgrp;
#endif
static pid_t pgrp = -1;
pid_t tc_pgrp;
#endif
@@
-129,7
+129,7
@@
void show_progress(OFF_T ofs, OFF_T size)
if (am_server)
return;
if (am_server)
return;
-#if
HAVE_GETPGRP &&
HAVE_TCGETPGRP
+#if
defined HAVE_GETPGRP && defined
HAVE_TCGETPGRP
if (pgrp == -1)
pgrp = getpgrp(GETPGRP_ARG);
#endif
if (pgrp == -1)
pgrp = getpgrp(GETPGRP_ARG);
#endif
@@
-165,7
+165,7
@@
void show_progress(OFF_T ofs, OFF_T size)
ph_list[newest_hpos].ofs = ofs;
}
ph_list[newest_hpos].ofs = ofs;
}
-#if
HAVE_GETPGRP &&
HAVE_TCGETPGRP
+#if
defined HAVE_GETPGRP && defined
HAVE_TCGETPGRP
tc_pgrp = tcgetpgrp(STDOUT_FILENO);
if (tc_pgrp != pgrp && tc_pgrp != -1)
return;
tc_pgrp = tcgetpgrp(STDOUT_FILENO);
if (tc_pgrp != pgrp && tc_pgrp != -1)
return;