From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 28 Oct 2023 17:20:14 +0000 (+0200)
Subject: Merge topic branch t/ls-L into master
X-Git-Tag: v0.7.3~10
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=624910afb851cf78669be188214b0332d5d5ee12

Merge topic branch t/ls-L into master

A single patch which implements the new --limit option for the ls
server command. The confict in aft.c was trivial to fix.

* refs/heads/t/ls-L:
  server: Implement ls --limit.
---

624910afb851cf78669be188214b0332d5d5ee12
diff --cc NEWS.md
index aa515e5a,598db71f..5430790b
--- a/NEWS.md
+++ b/NEWS.md
@@@ -1,27 -1,6 +1,29 @@@
  NEWS
  ====
  
 +----------------------------------------------
 +0.7.3 (to be announced) "weighted correctness"
 +----------------------------------------------
 +
 +- Old style PEM keys are now deprecated. They still work but their
 +  use results in a run-time warning. The removal of PEM key support is
 +  scheduled for paraslash-0.8.0.
 +- Version 1.0 of the openssl library has been deprecated. A warning
 +  is printed at compile-time on systems which have this outdated version
 +  because it will no longer be supported once paraslash-0.8.0 comes out.
 +- A spring cleanup for the senescent code in fd.c.
 +- The --admissible option of the ls command now takes an optional
 +  argument. When invoked like --admissible=m/foo, only files which are
 +  admissible with respect to mood foo are listed.
 +- The select server command is now quiet by default, The new --verbose
 +  option can be used to show information about the newly loaded mood
 +  or playlist.
++- The ls server command gained the --limit option to force a limit
++  on the number of files listed.
 +
 +Downloads:
 +[tarball](./releases/paraslash-git.tar.xz)
 +
  -------------------------------------
  0.7.2 (2023-03-08) "optical friction"
  -------------------------------------
diff --cc aft.c
index 4ea8641b,ff75361d..f1aca7fb
--- a/aft.c
+++ b/aft.c
@@@ -1402,9 -1365,10 +1402,10 @@@ static int com_ls_callback(struct afs_c
  {
  	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;
 +	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);