Really close fd at upload completion

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 97f46e0dd37d287360e5192a42584defdb3f5c1e..cb70cd861c84a6a015599ef84efaf1357fa94f0e 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -2,6 +2,7 @@
 @section Новости
 
 @menu
+* Релиз 7.3.1::
 * Релиз 7.3.0::
 * Релиз 7.2.1::
 * Релиз 7.2.0::
@@ -53,6 +54,16 @@
 * Релиз 0.2::
 @end menu
 
+@node Релиз 7.3.1
+@subsection Релиз 7.3.1
+@itemize
+
+@item
+Исправлена проблема с возможно остающимся открытым файловым
+дескриптором в online командах.
+
+@end itemize
+
 @node Релиз 7.3.0
 @subsection Релиз 7.3.0
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index 20ff3d6f0c71578d3239fe7d4d770c678ada23b4..3be46521997af74df8fe203d5ac9e849a3337358 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -4,6 +4,7 @@
 See also this page @ref{Новости, on russian}.
 
 @menu
+* Release 7.3.1: Release 7_3_1.
 * Release 7.3.0: Release 7_3_0.
 * Release 7.2.1: Release 7_2_1.
 * Release 7.2.0: Release 7_2_0.
@@ -55,6 +56,15 @@ See also this page @ref{Новости, on russian}.
 * Release 0.2: Release 0_2.
 @end menu
 
+@node Release 7_3_1
+@section Release 7.3.1
+@itemize
+
+@item
+Fixed possibly left opened file descriptor in online commands.
+
+@end itemize
+
 @node Release 7_3_0
 @section Release 7.3.0
 @itemize

diff --git a/src/nncp.go b/src/nncp.go
index 3bfcb3a52e1a8763fba333046f9b56ba626d7ce6..67c0ae947db460dfca93867fdcf94698f21dacc3 100644 (file)
--- a/src/nncp.go
+++ b/src/nncp.go
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 const Base32Encoded32Len = 52
 
 var (
-       Version string = "7.3.0"
+       Version string = "7.3.1"
 
        Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )

diff --git a/src/sp.go b/src/sp.go
index 5937d35e30084d5480adedf273afd2e209aa1ddf..58b9bb2f202ef21261b3775b159714fe5f973d48 100644 (file)
--- a/src/sp.go
+++ b/src/sp.go
@@ -952,22 +952,25 @@ func (state *SPState) StartWorkers(
                                        state.progressBars[pktName] = struct{}{}
                                        Progress("Tx", lesp)
                                }
+                               if ourSize == uint64(fullSize) {
+                                       state.closeFd(pth)
+                                       state.Ctx.LogD("sp-file-finished", lesp, func(les LEs) string {
+                                               return logMsg(les) + ": finished"
+                                       })
+                                       if state.Ctx.ShowPrgrs {
+                                               delete(state.progressBars, pktName)
+                                       }
+                               }
                                state.Lock()
                                for i, q := range state.queueTheir {
                                        if *q.freq.Hash != *freq.Hash {
                                                continue
                                        }
                                        if ourSize == uint64(fullSize) {
-                                               state.Ctx.LogD("sp-file-finished", lesp, func(les LEs) string {
-                                                       return logMsg(les) + ": finished"
-                                               })
                                                state.queueTheir = append(
                                                        state.queueTheir[:i],
                                                        state.queueTheir[i+1:]...,
                                                )
-                                               if state.Ctx.ShowPrgrs {
-                                                       delete(state.progressBars, pktName)
-                                               }
                                        } else {
                                                q.freq.Offset = ourSize
                                        }