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
Refer to the old basedir variable as dir.root.
[rsync/rsync.git]
/
progress.c
diff --git
a/progress.c
b/progress.c
index
0cb5060
..
cda9178
100644
(file)
--- a/
progress.c
+++ b/
progress.c
@@
-26,6
+26,12
@@
extern int am_server;
#define PROGRESS_HISTORY_SECS 5
#define PROGRESS_HISTORY_SECS 5
+#if GETPGRP_VOID
+#define GETPGRP_ARG
+#else
+#define GETPGRP_ARG 0
+#endif
+
struct progress_history {
struct timeval time;
OFF_T ofs;
struct progress_history {
struct timeval time;
OFF_T ofs;
@@
-124,13
+130,8
@@
void show_progress(OFF_T ofs, OFF_T size)
return;
#if HAVE_GETPGRP && HAVE_TCGETPGRP
return;
#if HAVE_GETPGRP && HAVE_TCGETPGRP
- if (pgrp == -1) {
-# if GETPGRP_VOID
- pgrp = getpgrp();
-# else
- pgrp = getpgrp(0);
-# endif
- }
+ if (pgrp == -1)
+ pgrp = getpgrp(GETPGRP_ARG);
#endif
gettimeofday(&now, NULL);
#endif
gettimeofday(&now, NULL);