lftp.conf       |    3 +++

 lib/glob.c      |    1 +

 m4/lftp.m4      |    2 +-

 src/Fish.cc     |    6 +++---

 src/Job.h       |    3 +--

 src/Makefile.am |   16 ++++++++++------

 src/SleepJob.cc |    2 +-

 src/mgetJob.cc  |    2 +-

 8 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/lftp.conf b/lftp.conf

index 08d6f7c..9d350ea 100644

--- a/lftp.conf

+++ b/lftp.conf

@@ -1,5 +1,8 @@

 ## some useful aliases

 alias dir ls

+alias l "ls -lt"

+alias cd.. "cd .."

+alias q quit

 alias less more

 alias zless zmore

 alias bzless bzmore

diff --git a/lib/glob.c b/lib/glob.c

index 03b55df..324057d 100644

--- a/lib/glob.c

+++ b/lib/glob.c

@@ -20,6 +20,7 @@

 /* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc

    optimizes away the pattern == NULL || pglob == NULL tests below.  */

+#undef _GL_ARG_NONNULL

 #define _GL_ARG_NONNULL(params)

 #include <glob.h>

diff --git a/m4/lftp.m4 b/m4/lftp.m4

index 88b79fe..bf90ac9 100644

--- a/m4/lftp.m4

+++ b/m4/lftp.m4

@@ -67,7 +67,7 @@ esac

 AC_DEFUN([LFTP_NOIMPLEMENTINLINE],

 [

    AC_MSG_CHECKING(if -fno-implement-inlines implements virtual functions)

-   flags="-fno-implement-inlines -Winline"

+   flags="-fno-implement-inlines"

    AC_CACHE_VAL(lftp_cv_noimplementinline,

    [

       AC_LANG_PUSH(C++)

diff --git a/src/Fish.cc b/src/Fish.cc

index e995bb5..d07c653 100644

--- a/src/Fish.cc

+++ b/src/Fish.cc

@@ -553,7 +553,7 @@ int Fish::HandleReplies()

 	 const char *eol=strchr(err,'\n');

 	 if(eol) {

 	    xstring &e=xstring::get_tmp(err,eol-err);

-	    LogError(0,e);

+	    LogError(0,"%s",e.get());

 	    SetError(NO_FILE,e);

 	    if(pty_recv_buf)

 	       pty_recv_buf->Skip(eol-err+1);

@@ -577,7 +577,7 @@ int Fish::HandleReplies()

       }

       if(recv_buf->Eof())

       {

-	 LogError(0,_("Peer closed connection"));

+	 LogError(0,"%s",_("Peer closed connection"));

 	 // Solaris' shell exists when is given with wrong directory

 	 if(!RespQueueIsEmpty() && RespQueue[0]==EXPECT_CWD && message)

 	    SetError(NO_FILE,message);

@@ -621,7 +621,7 @@ int Fish::HandleReplies()

    if(RespQueueIsEmpty())

    {

-      LogError(3,_("extra server response"));

+      LogError(3,"%s",_("extra server response"));

       message.set(0);

       return m;

    }

diff --git a/src/Job.h b/src/Job.h

index a23e69a..34b8a28 100644

--- a/src/Job.h

+++ b/src/Job.h

@@ -76,8 +76,7 @@ public:

    virtual void	ShowRunStatus(const SMTaskRef<StatusLine>&);

    void ClearStatus()

       {

-	 const char *empty="";

-	 eprintf(empty);

+	 eprintf("%s", "");

       }

    virtual void	  SayFinal() {}; // final phrase of fg job

    virtual int	  Done()=0;

diff --git a/src/Makefile.am b/src/Makefile.am

index 839ec9b..5985b91 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -56,14 +56,18 @@ cmd_mirror_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)

 cmd_sleep_la_LDFLAGS  = -module -avoid-version -rpath $(pkgverlibdir)

 cmd_torrent_la_LDFLAGS= -module -avoid-version -rpath $(pkgverlibdir)

 liblftp_pty_la_LDFLAGS     = -avoid-version -rpath $(pkgverlibdir)

+liblftp_pty_la_LIBADD      = liblftp-tasks.la

 liblftp_network_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir) $(OPENSSL_LDFLAGS)

-liblftp_network_la_LIBADD  = $(SOCKSLIBS) $(OPENSSL_LIBS) $(LIBGNUTLS_LIBS)

-

-proto_ftp_la_LIBADD  = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la

-proto_http_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la $(EXPAT_LIBS)

-proto_fish_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la liblftp-pty.la

-proto_sftp_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la liblftp-pty.la

-cmd_torrent_la_LIBADD  = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la

+liblftp_network_la_LIBADD  = liblftp-tasks.la $(SOCKSLIBS) $(OPENSSL_LIBS) $(LIBGNUTLS_LIBS)

+

+proto_file_la_LIBADD = liblftp-tasks.la

+proto_ftp_la_LIBADD  = -L$(DESTDIR)$(pkgverlibdir) liblftp-tasks.la liblftp-network.la

+proto_http_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-tasks.la liblftp-network.la $(EXPAT_LIBS)

+proto_fish_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-tasks.la liblftp-network.la liblftp-pty.la

+proto_sftp_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-tasks.la liblftp-network.la liblftp-pty.la

+cmd_mirror_la_LIBADD = liblftp-jobs.la liblftp-tasks.la

+cmd_sleep_la_LIBADD  = liblftp-jobs.la liblftp-tasks.la

+cmd_torrent_la_LIBADD  = -L$(DESTDIR)$(pkgverlibdir) liblftp-jobs.la liblftp-tasks.la liblftp-network.la

 liblftp_tasks_la_SOURCES = PollVec.cc PollVec.h SMTask.cc SMTask.h ProcWait.cc\

  ProcWait.h GetPass.cc GetPass.h ConnectionSlot.cc ConnectionSlot.h\

diff --git a/src/SleepJob.cc b/src/SleepJob.cc

index 896f0ca..c784667 100644

--- a/src/SleepJob.cc

+++ b/src/SleepJob.cc

@@ -121,7 +121,7 @@ void SleepJob::ShowRunStatus(const SMTaskRef<StatusLine>& s)

       Job::ShowRunStatus(s);

    else

    {

-      s->Show(Status());

+      s->Show("%s",Status());

       current->TimeoutS(1);

    }

 }

diff --git a/src/mgetJob.cc b/src/mgetJob.cc

index 7eac298..f9f1805 100644

--- a/src/mgetJob.cc

+++ b/src/mgetJob.cc

@@ -37,7 +37,7 @@ void mgetJob::ShowRunStatus(const SMTaskRef<StatusLine>& s)

 {

    if(rg)

    {

-      s->Show(rg->Status());

+      s->Show("%s",rg->Status());

       return;

    }

    GetJob::ShowRunStatus(s);