X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=c04d4f9c99e89afb451afe94be7fcc64461b15e1;hp=4ea8641b2acce666e53d7005bd755ae2099cb07a;hb=HEAD;hpb=4345aa176aecdbd9a876e7efdcc034acd29616a7

diff --git a/aft.c b/aft.c
index 4ea8641b..f1aca7fb 100644
--- a/aft.c
+++ b/aft.c
@@ -1402,9 +1402,10 @@ static int com_ls_callback(struct afs_callback_arg *aca)
 {
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(LS);
 	struct ls_options *opts = aca->query.data;
-	int i = 0, ret;
+	int ret;
 	time_t current_time;
 	const struct lls_opt_result *r_r, *r_a;
+	uint32_t limit, k, n;
 
 	ret = lls_deserialize_parse_result(
 		(char *)aca->query.data + sizeof(*opts), cmd, &opts->lpr);
@@ -1420,7 +1421,8 @@ static int com_ls_callback(struct afs_callback_arg *aca)
 			prepare_ls_row));
 	if (ret < 0)
 		goto out;
-	if (opts->num_matching_paths == 0) {
+	n = opts->num_matching_paths;
+	if (n == 0) {
 		ret = lls_num_inputs(opts->lpr) > 0? -E_NO_MATCH : 0;
 		goto out;
 	}
@@ -1428,20 +1430,14 @@ static int com_ls_callback(struct afs_callback_arg *aca)
 	if (ret < 0)
 		goto out;
 	time(&current_time);
-	if (lls_opt_given(r_r))
-		for (i = opts->num_matching_paths - 1; i >= 0; i--) {
-			ret = print_list_item(opts->data_ptr[i], opts,
-				&aca->pbout, current_time);
-			if (ret < 0)
-				goto out;
-		}
-	else
-		for (i = 0; i < opts->num_matching_paths; i++) {
-			ret = print_list_item(opts->data_ptr[i], opts,
-				&aca->pbout, current_time);
-			if (ret < 0)
-				goto out;
-		}
+	limit = SERVER_CMD_UINT32_VAL(LS, LIMIT, opts->lpr);
+	for (k = 0; k < n && (limit == 0 || k < limit); k++) {
+		uint32_t idx = lls_opt_given(r_r)? n - 1 - k : k;
+		ret = print_list_item(opts->data_ptr[idx], opts, &aca->pbout,
+			current_time);
+		if (ret < 0)
+			goto out;
+	}
 out:
 	lls_free_parse_result(opts->lpr, cmd);
 	free(opts->data);