File lftp-3.6.3-missing-sentinel.patch of Package lftp
Index: src/CmdExec.cc
===================================================================
--- src/CmdExec.cc.orig 2009-03-23 15:20:45.000000000 +0100
+++ src/CmdExec.cc 2009-03-23 15:29:23.000000000 +0100
@@ -1057,7 +1057,7 @@ char *ArgV::CombineQuoted(int start) con
{
const char *arg=String(start++);
if(CmdExec::needs_quotation(arg))
- res.vappend("\"",CmdExec::unquote(arg),"\"",NULL);
+ res.vappend("\"",CmdExec::unquote(arg),"\"", (char *) NULL);
else
res.append(arg);
if(start>=Count())
@@ -1284,7 +1284,7 @@ CmdExec *CmdExec::GetQueue(bool create)
queue->SetParentFg(this,false);
queue->AllocJobno();
const char *url=session->GetConnectURL(FA::NO_PATH);
- queue->cmdline.vset("queue (",url,slot?"; ":"",slot?slot.get():"",")",NULL);
+ queue->cmdline.vset("queue (",url,slot?"; ":"",slot?slot.get():"",")", (char *)NULL);
queue->queue_feeder=new QueueFeeder(session->GetCwd(), cwd->GetName());
queue->SetCmdFeeder(queue->queue_feeder);
queue->Reconfig(0);
Index: src/DummyProto.cc
===================================================================
--- src/DummyProto.cc.orig 2007-04-23 09:11:40.000000000 +0200
+++ src/DummyProto.cc 2009-03-23 15:30:46.000000000 +0100
@@ -60,6 +60,6 @@ FileAccess *DummyNoProto::Clone() const
const char *DummyNoProto::StrError(int)
{
static xstring str;
- str.vset(proto.get(),_(" - not supported protocol"),NULL);
+ str.vset(proto.get(),_(" - not supported protocol"), (char *)NULL);
return str;
}
Index: src/FileGlob.cc
===================================================================
--- src/FileGlob.cc.orig 2007-12-28 11:23:10.000000000 +0100
+++ src/FileGlob.cc 2009-03-23 15:32:15.000000000 +0100
@@ -330,6 +330,6 @@ const char *GenericGlob::Status()
return st;
static xstring buf;
- buf.vset(curr_dir,": ",st,NULL);
+ buf.vset(curr_dir,": ",st, (char *)NULL);
return buf;
}
Index: src/GetJob.cc
===================================================================
--- src/GetJob.cc.orig 2007-12-28 15:55:13.000000000 +0100
+++ src/GetJob.cc 2009-03-23 15:33:10.000000000 +0100
@@ -81,7 +81,7 @@ FileCopyPeer *GetJob::DstLocal(const cha
count++;
return 0;
}
- backup_file.vset(f,"~",NULL);
+ backup_file.vset(f,"~", (char *)NULL);
if(rename(f,backup_file)!=0)
backup_file.set(0);
else
Index: src/LocalAccess.cc
===================================================================
--- src/LocalAccess.cc.orig 2007-12-28 11:23:10.000000000 +0100
+++ src/LocalAccess.cc 2009-03-23 15:35:26.000000000 +0100
@@ -71,9 +71,9 @@ void LocalAccess::errno_handle()
int e=errno;
const char *err=strerror(e);
if(mode==RENAME)
- error.vset("rename(",file.get(),", ",file1.get(),"): ",err,NULL);
+ error.vset("rename(",file.get(),", ",file1.get(),"): ",err, (char *)NULL);
else
- error.vset(file.get(),": ",err,NULL);
+ error.vset(file.get(),": ",err, (char *)NULL);
if(e!=EEXIST)
LogError(0,"%s",error.get());
}
Index: src/QueueFeeder.cc
===================================================================
--- src/QueueFeeder.cc.orig 2007-04-06 18:14:39.000000000 +0200
+++ src/QueueFeeder.cc 2009-03-23 15:36:38.000000000 +0100
@@ -40,16 +40,16 @@ const char *QueueFeeder::NextCmd(CmdExec
buffer.truncate(0);
if(xstrcmp(cur_pwd, job->pwd)) {
- buffer.vappend("cd \"",CmdExec::unquote(job->pwd),"\"; ",NULL);
+ buffer.vappend("cd \"",CmdExec::unquote(job->pwd),"\"; ", (char *)NULL);
cur_pwd.set(job->pwd);
}
if(xstrcmp(cur_lpwd, job->lpwd)) {
- buffer.vappend("lcd \"",CmdExec::unquote(job->lpwd),"\"; ",NULL);
+ buffer.vappend("lcd \"",CmdExec::unquote(job->lpwd),"\"; ", (char *)NULL);
cur_lpwd.set(job->lpwd);
}
- buffer.vappend(job->cmd.get(),"\n",NULL);
+ buffer.vappend(job->cmd.get(),"\n", (char *)NULL);
delete job;
return buffer;
}
Index: src/history.cc
===================================================================
--- src/history.cc.orig 2007-09-10 12:40:12.000000000 +0200
+++ src/history.cc 2009-03-23 15:37:22.000000000 +0100
@@ -40,7 +40,7 @@ History::History()
modified=false;
const char *home=get_lftp_home();
if(home)
- file.vset(home,"/cwd_history",NULL);
+ file.vset(home,"/cwd_history", (char *)NULL);
}
History::~History()