Fix for #20

* also changed version scheme to semver (see https://semver.org/)
* also fixed GHA build badge

Author: fscheiner

.github/workflows/build-deploy.yml

@@ -3,7 +3,7 @@ name: Build/Deploy
 on:
   push:
     tags:
-      - Version_[0-9]+_[0-9]+
+      - Version_[0-9]+_[0-9]+_[0-9]+
   pull_request:
 
 jobs:

ChangeLog

@@ -1,4 +1,9 @@
-Version 2.9 (Pre Release)
+Version 2.9.1 (Pre Release)
+	- The fix for recursive listings was incomplete and created a regression
+	  preventing recursive file transfer operations to succeed. This is
+	  fixed now.
+
+Version 2.9 09/02/22
 	- Build fixed for 32bit
 	- Added IPv6 support provided by Francesco Prelz of INFN Milan
 	- Fixed recursive listings

NEWS

@@ -1,3 +1,10 @@
+Version 2.9.1
+-------------
+Version number scheme changed to semver (see semver.org)
+Bugfixes:
+- get -r and mget didn't work correctly in version 2.9 compared to version 2.8.
+  This is fixed in this version.
+
 Version 2.9
 -----------
 First gridcf.org release

README.md

@@ -1,12 +1,12 @@
 UberFTP
 =======
 
-[![Build/Deploy](https://github.com/fscheiner/UberFTP/actions/workflows/build-deploy.yml/badge.svg)](https://github.com/fscheiner/UberFTP/actions/workflows/build-deploy.yml)
+[![Build/Deploy](https://github.com/gridcf/UberFTP/actions/workflows/build-deploy.yml/badge.svg)](https://github.com/gridcf/UberFTP/actions/workflows/build-deploy.yml)
 [![Build Status](https://app.travis-ci.com/gridcf/UberFTP.svg?branch=master)](https://travis-ci.com/github/gridcf/UberFTP)
 
 Interactive GridFTP client
 
 UberFTP is a GridFTP-enabled client that supports both interactive use and FTP commands on the `uberftp` command line to transfer files between two computers. It is intended for use with computers that have a GridFTP server installed. UberFTP supports GSI authentication, parallel data channels and striping.
 
 > **NOTICE:**
-> UberFTP v2.9 uses `EPSV` and `EPRT` (see [RFC 2428](https://tools.ietf.org/html/rfc2428) for details) to support both IPv4 and IPv6 addresses. To maintain compatibility from a [Globus GridFTP](https://gridcf.org/gct-docs/latest/gridftp/index.html) service, use the configuration options `epsv_ip 1` and `epsv_match 1` for the PI (frontend process) of that service **if** its PI(s) and DTP(s) (backend process(es)) are located on different hosts.
+> UberFTP since v2.9 uses `EPSV` and `EPRT` (see [RFC 2428](https://tools.ietf.org/html/rfc2428) for details) to support both IPv4 and IPv6 addresses. To maintain compatibility from a [Globus GridFTP](https://gridcf.org/gct-docs/latest/gridftp/index.html) service, use the configuration options `epsv_ip 1` and `epsv_match 1` for the PI (frontend process) of that service **if** its PI(s) and DTP(s) (backend process(es)) are located on different hosts.

VERSION

@@ -1 +1 @@
-2.9
+2.9.1

ftp.c

@@ -4037,6 +4037,7 @@ _f_readdir_mlsd(pd_t * pd, char * path, ml_t *** mlp, char * token)
 	o_printf(DEBUG_VERBOSE, "MLSD output:\n");
 	o_printf(DEBUG_VERBOSE, "%s", listing);
 
+	eol = listing + strlen(listing) - 1;
 	for (rec = listing; rec < eol; rec = eor+2)
         {
 		eor  = strstr(rec, "\r\n");

packaging/fedora/uberftp.spec

@@ -1,7 +1,7 @@
 # Based on https://src.fedoraproject.org/rpms/uberftp/blob/8046ad31980b197f8dc9879a3975d0db6717d882/f/uberftp.spec
 
 Name:           uberftp
-Version:        2.9
+Version:        2.9.1
 Release:        1%{?dist}
 Summary:        GridFTP-enabled FTP client
 
@@ -36,6 +36,11 @@ make install DESTDIR=%{buildroot}
 
 %changelog
 
+* Thu Jul 14 2022 Frank Scheiner <[email protected]> - 2.9.1-1
+- New upstream version 2.9.1
+- changed version scheme to semver (see semver.org)
+- fixed recursive listings
+
 * Tue Jan 18 2022 Frank Scheiner <[email protected]> - 2.9-1
 - New upstream version 2.9