~ubuntu-branches/ubuntu/precise/fte/precise

Committer: Bazaar Package Importer
Author(s): Neil Williams
Date: 2011-08-14 10:28:46 UTC
mfrom: (1.1.7 sid)
Revision ID: james.westby@ubuntu.com-20110814102846-kate2jfkduwpnika

Tags: 0.50.2b6-1

http://bugs.debian.org/195945

* QA upload.
* Synchronise with current upstream sources.
(Closes: #195945)
* Include NMUs by Nobuhiro Iwamatsu and Hideki Yamane,
thanks to both.
* Move to 3.0 quilt

files added:
debian/source

debian/source/format

files removed:
.bzr-builddeb

.bzr-builddeb/default.conf

control

rpm/mkRPM

scripts

scripts/conv

scripts/conv.cmd

scripts/html2ipf.pl

scripts/mkbuildlvl.pl

scripts/mkcmds.pl

scripts/mkcontents.pl

scripts/uncrustify.cfg

scripts/valgrind-suppressions

files modified:
NEWS

config/global.fte

config/m_fte.fte

config/m_java.fte

config/m_perl.fte

config/m_sh.fte

debian/changelog

debian/control

debian/copyright

debian/rules

src/c_bind.cpp

src/c_commands.h

src/c_config.cpp

src/c_config.h

src/c_desktop.cpp

src/c_hilit.cpp

src/c_hilit.h

src/c_history.cpp

src/c_mode.h

src/cfte.cpp

src/clip_gpm.cpp

src/clip_no.cpp

src/clip_os2.cpp

src/clip_pm.cpp

src/clip_pmv.cpp

src/clip_vio.cpp

src/clip_x11.cpp

src/compkeys.cpp

src/con_dosx.cpp

src/con_linux.cpp

src/con_ncurses.cpp

src/con_nt.cpp

src/con_os2.cpp

src/con_slang.cpp

src/con_x11.cpp

src/console.h

src/e_buffer.cpp

src/e_cvslog.cpp

src/e_fold.cpp

src/e_line.cpp

src/e_loadsave.cpp

src/e_mark.cpp

src/e_regex.h

src/e_search.cpp

src/e_svnlog.cpp

src/e_tags.cpp

src/e_tags.h

src/e_unix.cpp

src/e_win32.cpp

src/egui.cpp

src/feature.h

src/fte-msvc.mak

src/fte.cpp

src/fte.h

src/fte2.cpp

src/g_motif.cpp

src/g_pm.cpp

src/g_qt.cpp

src/g_text.cpp

src/g_unix_pipe.cpp

src/gui.cpp

src/gui.h

src/h_perl.cpp

src/h_rexx.cpp

src/i_complete.cpp

src/i_input.cpp

src/i_oview.cpp

src/o_buffer.cpp

src/o_buflist.cpp

src/o_cvsbase.cpp

src/o_cvsdiff.cpp

src/o_directory.cpp

src/o_list.cpp

src/o_messages.cpp

src/o_model.cpp

src/o_routine.cpp

src/o_svnbase.cpp

src/o_svndiff.cpp

src/objs.inc

src/s_direct.cpp

src/s_direct.h

src/s_files.cpp

src/s_files.h

src/s_string.h

src/s_util.cpp

src/sysdep.h

src/view.cpp

Show diffs side-by-side

added added

removed removed

src/o_directory.cpp

#include <stdio.h>

#include <time.h>

#include "o_directory.h"

#include "c_config.h"

#include "c_commands.h"

#include "c_history.h"

#include "i_modelview.h"

struct tm *t;

time_t tim;

off_t Size = Files[Line]->Size();

char SizeStr[16];

char ModeStr[11];

tim = Files[Line]->MTime();

t = localtime(&tim);

} else

sprintf(SizeStr, "%8ld", (long) Size);

#ifdef UNIX

if (Files[Line]->Mode() >= 0)

{

const int mode = Files[Line]->Mode();

ModeStr[0] = mode & S_IFDIR ? 'd' : '-';

ModeStr[1] = mode & S_IRUSR ? 'r' : '-';

ModeStr[2] = mode & S_IWUSR ? 'w' : '-';

ModeStr[3] = mode & S_IXUSR ? 'x' : '-';

ModeStr[4] = mode & S_IRGRP ? 'r' : '-';

ModeStr[5] = mode & S_IWGRP ? 'w' : '-';

ModeStr[6] = mode & S_IXGRP ? 'x' : '-';

ModeStr[7] = mode & S_IROTH ? 'r' : '-';

ModeStr[8] = mode & S_IWOTH ? 'w' : '-';

100

ModeStr[9] = mode & S_IXOTH ? 'x' : '-';

101

ModeStr[10] = '\0';

102

}

103

else

104

ModeStr[0] = '\0';

105

#endif

106

107

int l = snprintf(s, sizeof(s),

108

#ifdef UNIX

109

"%10s "

110

#endif

111

"%04d/%02d/%02d %02d:%02d:%02d %s %s%c",

112

#ifdef UNIX

113

ModeStr,

114

#endif

115

Year, Mon, Day, Hour, Min, Sec, SizeStr,

116

Files[Line]->Name(),

117

(Files[Line]->Type() == fiDIRECTORY) ? SLASH : ' ');

131

162

132

163

rc = ff->FindFirst(&fi);

133

164

while (rc == 0) {

134

assert(fi != 0);

135

if (strcmp(fi->Name(), ".") != 0) {

165

assert(fi != 0);

166

167

if (

168

strcmp(fi->Name(), ".") != 0 &&

169

( ShowTildeFilesInDirList || fi->Name()[strlen(fi->Name())-1] != '~' )

170

) {

136

171

Files = (FileInfo **)realloc((void *)Files, ((FCount | 255) + 1) * sizeof(FileInfo *));

137

172

if (Files == 0)

138

173

{

192

227

case ExActivateInOtherWindow:

193

228

SearchLen = 0;

194

229

Msg(S_INFO, "");

195

if (Files && Row >= 0 && Row < FCount) {

196

if (isDir(Row)) {

197

} else {

230

if (Files && Row >= 0 && Row < FCount)

231

if (!isDir(Row))

198

232

return FmLoad(Files[Row]->Name(), View->Next);

199

}

200

}

201

return ErFAIL;

233

return 0;

202

234

203

235

case ExRescan:

204

if (RescanDir() == 0)

205

return ErFAIL;

206

return ErOK;

236

return RescanDir();

207

237

208

238

case ExDirGoUp:

209

239

SearchLen = 0;

210

240

Msg(S_INFO, "");

211

241

FmChDir(SDOT SDOT);

212

return ErOK;

242

return 1;

213

243

214

244

case ExDirGoDown:

215

245

SearchLen = 0;

217

247

if (Files && Row >= 0 && Row < FCount) {

218

248

if (isDir(Row)) {

219

249

FmChDir(Files[Row]->Name());

220

return ErOK;

250

return 1;

221

251

}

222

252

}

223

return ErFAIL;

253

return 0;

224

254

225

255

case ExDirGoto:

226

256

SearchLen = 0;

231

261

SearchLen = 0;

232

262

Msg(S_INFO, "");

233

263

FmChDir(SSLASH);

234

return ErOK;

264

return 1;

235

265

236

266

case ExDirSearchCancel:

237

267

// Kill search when moving

238

268

SearchLen = 0;

239

269

Msg(S_INFO, "");

240

return ErOK;

270

return 1;

241

271

242

272

case ExDirSearchNext:

243

273

// Find next matching file, search is case in-sensitive while sorting is sensitive

249

279

}

250

280

}

251

281

}

252

return ErOK;

282

return 1;

253

283

254

284

case ExDirSearchPrev:

255

285

// Find prev matching file, search is case in-sensitive while sorting is sensitive

261

291

}

262

292

}

263

293

}

264

return ErOK;

294

return 1;

265

295

266

296

case ExDeleteFile:

267

297

SearchLen = 0;

Older »