X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=eea7510fd0589e86fb4058dd7f4361f3c79901aa;hp=0ae163ad6ab96efe8c63bb109f7fb6f98a7667ad;hb=ce9e297eb91a932a11f81890c800d0380b5bc9c9;hpb=bc15c3ff65eb00e04ebc303cfa9ee3d1a4675b35 diff --git a/client_common.c b/client_common.c index 0ae163ad..eea7510f 100644 --- a/client_common.c +++ b/client_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2014 Andre Noll + * Copyright (C) 1997 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -159,7 +159,10 @@ again: } if (n == 0) return 0; - if (!sb_received(ct->sbc[0], n, result)) + ret = sb_received(ct->sbc[0], n, result); + if (ret < 0) + return ret; + if (ret == 0) goto again; ct->sbc[0] = NULL; return 1; @@ -289,11 +292,6 @@ static int client_post_select(struct sched *s, void *context) if (ret < 0 || n == 0) goto out; ct->features = parse_features(buf); - if (!has_feature("sideband", ct)) { - PARA_ERROR_LOG("server has no sideband support\n"); - ret = -E_INCOMPAT_FEAT; - goto out; - } ct->status = CL_RECEIVED_WELCOME; return 0; case CL_RECEIVED_WELCOME: /* send auth command */ @@ -400,7 +398,7 @@ static int client_post_select(struct sched *s, void *context) btr_consume(ct->btrn[1], sz); } } - /* fall though */ + /* fall through */ case CL_EXECUTING: if (ct->btrn[0]) { ret = btr_node_status(ct->btrn[0], 0, BTR_NT_ROOT);