[openssh-commits] [openssh] branch master updated: fix merge botch that put lines in wrong function

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new ae7373dfe fix merge botch that put lines in wrong function
ae7373dfe is described below

commit ae7373dfe1e967036cdb948b814bb1eca78bc5ff
Author: Damien Miller <djm at mindrot.org>
AuthorDate: Tue Sep 15 21:17:51 2026 +1000

    fix merge botch that put lines in wrong function
    
    sdirent_cmp() looked similar enough to sglob_cmp() for patch
---
 sftp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sftp.c b/sftp.c
index 9b403f139..831e16d5e 100644
--- a/sftp.c
+++ b/sftp.c
@@ -853,9 +853,6 @@ sdirent_comp(const void *aa, const void *bb)
 	int rmul = sort_flag & LS_REVERSE_SORT ? -1 : 1;
 
 #define NCMP(a,b) (a == b ? 0 : (a < b ? 1 : -1))
-	/* order entries without stat information last */
-	if (as == NULL || bs == NULL)
-		return (as == bs) ? 0 : (as == NULL ? rmul : -rmul);
 	if (sort_flag & LS_NAME_SORT)
 		return (rmul * strcmp(a->filename, b->filename));
 	else if (sort_flag & LS_TIME_SORT)
@@ -971,6 +968,9 @@ sglob_comp(const void *aa, const void *bb)
 	int rmul = sort_flag & LS_REVERSE_SORT ? -1 : 1;
 
 #define NCMP(a,b) (a == b ? 0 : (a < b ? 1 : -1))
+	/* order entries without stat information last */
+	if (as == NULL || bs == NULL)
+		return (as == bs) ? 0 : (as == NULL ? rmul : -rmul);
 	if (sort_flag & LS_NAME_SORT)
 		return (rmul * strcmp(ap, bp));
 	else if (sort_flag & LS_TIME_SORT) {

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.