Hello,

Am Sonntag, den 25.03.2012, 12:47 +0200 schrieb Noël Köthe:

> attached is a patch for the problem from Simon Ruderich
> <si...@ruderich.org>:

changed (minor whitespace) to apply cleanly.

-- 
Noël Köthe <noel debian.org>
Debian GNU/Linux, www.debian.org
Description: Fix errors reported by -Werror=format-security.
Author: Simon Ruderich <si...@ruderich.org>
Last-Update: 2012-03-13

Index: lftp-4.3.5/src/Fish.cc
===================================================================
--- lftp-4.3.5.orig/src/Fish.cc 2012-03-13 23:23:55.709806633 +0100
+++ lftp-4.3.5/src/Fish.cc      2012-03-13 23:24:31.593807999 +0100
@@ -564,7 +564,7 @@
 	 const char *eol=strchr(err,'\n');
 	 if(eol) {
 	    xstring &e=xstring::get_tmp(err,eol-err);
-	    LogError(0,e);
+	    LogError(0,"%s",e.tmp_buf(eol-err));
 	    SetError(NO_FILE,e);
 	    if(pty_recv_buf)
 	       pty_recv_buf->Skip(eol-err+1);
Index: lftp-4.3.5/src/Job.h
===================================================================
--- lftp-4.3.5.orig/src/Job.h   2012-03-13 23:23:55.677806632 +0100
+++ lftp-4.3.5/src/Job.h        2012-03-13 23:24:31.597807999 +0100
@@ -77,7 +77,7 @@
    void ClearStatus()
       {
 	 const char *empty="";
-	 eprintf(empty);
+	 eprintf("%s",empty); /* just "" causes a -Wformat-zero-length" warning, not sure what this line does though */
       }
    virtual void	  SayFinal() {}; // final phrase of fg job
    virtual int	  Done()=0;
Index: lftp-4.3.5/src/SleepJob.cc
===================================================================
--- lftp-4.3.5.orig/src/SleepJob.cc     2012-03-13 23:23:55.625806630 +0100
+++ lftp-4.3.5/src/SleepJob.cc  2012-03-13 23:24:31.597807999 +0100
@@ -119,7 +119,7 @@
       Job::ShowRunStatus(s);
    else
    {
-      s->Show(Status());
+      s->Show("%s",Status());
       current->TimeoutS(1);
    }
 }
Index: lftp-4.3.5/src/mgetJob.cc
===================================================================
--- lftp-4.3.5.orig/src/mgetJob.cc      2012-03-13 23:23:55.625806630 +0100
+++ lftp-4.3.5/src/mgetJob.cc   2012-03-13 23:24:31.597807999 +0100
@@ -36,7 +36,7 @@
 {
    if(rg)
    {
-      s->Show(rg->Status());
+      s->Show("%s",rg->Status());
       return;
    }
    GetJob::ShowRunStatus(s);

Attachment: signature.asc
Description: This is a digitally signed message part

_______________________________________________
lftp mailing list
lftp@uniyar.ac.ru
http://univ.uniyar.ac.ru/mailman/listinfo/lftp

Reply via email to