Move count var to the function stack and add O_NOCTTY to open().

This commit is contained in:
Andreas Schneider 2008-06-09 16:43:57 +02:00
parent 7f003c1277
commit 971e85871a

View file

@ -65,6 +65,7 @@ static int _csync_push_file(CSYNC *ctx, csync_file_stat_t *st) {
struct timeval times[2]; struct timeval times[2];
int rc = -1; int rc = -1;
int count = 0;
rep_bak = ctx->replica; rep_bak = ctx->replica;
@ -122,8 +123,7 @@ static int _csync_push_file(CSYNC *ctx, csync_file_stat_t *st) {
/* Create the destination file */ /* Create the destination file */
ctx->replica = drep; ctx->replica = drep;
while ((dfp = csync_vio_open(ctx, turi, O_CREAT|O_EXCL|O_WRONLY, st->mode)) == NULL) { while ((dfp = csync_vio_open(ctx, turi, O_CREAT|O_EXCL|O_WRONLY|O_NOCTTY, st->mode)) == NULL) {
int count = 0;
switch (errno) { switch (errno) {
case EEXIST: case EEXIST:
if (count++ > 10) { if (count++ > 10) {
@ -182,7 +182,9 @@ static int _csync_push_file(CSYNC *ctx, csync_file_stat_t *st) {
} }
} }
/* check filesize */ /*
* Check filesize
*/
ctx->replica = drep; ctx->replica = drep;
tstat = csync_vio_file_stat_new(); tstat = csync_vio_file_stat_new();
if (csync_vio_stat(ctx, turi, tstat) < 0) { if (csync_vio_stat(ctx, turi, tstat) < 0) {