diff options
author | Martin Kretzschmar <mkretzschmar@src.gnome.org> | 2003-03-31 23:23:17 (GMT) |
---|---|---|
committer | Martin Kretzschmar <mkretzschmar@src.gnome.org> | 2003-03-31 23:23:17 (GMT) |
commit | 8032fd96d450ac015c0153f1fa57e974d67b4993 (patch) | |
tree | dba81f5197969c0a5e55c50d3474c2cc817b3785 /pdf/goo | |
parent | 9ac495d6543dbd65992791bb41d5f8fbf90e549c (diff) |
update
* ANNOUNCE, CHANGES, README, aconf-win32.h: update
* xpdf/CharCodeToUnicode.cc, xpdf/Decrypt.cc, xpdf/FTFont.cc,
xpdf/FTFont.h, xpdf/FontEncodingTables.cc, xpdf/Gfx.cc,
xpdf/GfxFont.cc, xpdf/GfxState.cc, xpdf/GfxState.h,
xpdf/GlobalParams.cc, xpdf/GlobalParams.h, xpdf/Link.cc,
xpdf/NameToUnicodeTable.h, xpdf/Stream.cc, xpdf/TextOutputDev.cc,
xpdf/TextOutputDev.h, xpdf/XOutputDev.cc, xpdf/config.h,
xpdf/pdftotext.cc, xpdf/xpdf.cc, xpdf/Outline.cc, xpdf/XPDFApp.cc,
xpdf/XPDFApp.h, xpdf/XPDFCore.cc, xpdf/XPDFCore.h,
xpdf/XPDFViewer.cc, xpdf/XPDFViewer.h: update.
* goo/gfile.cc: update.
* goo/Makefile.am: use GMutex.h
* doc/pdffonts.1, doc/pdffonts.cat, doc/pdfimages.1,
doc/pdfimages.cat, doc/pdfinfo.1, doc/pdfinfo.cat, doc/pdftopbm.1,
doc/pdftopbm.cat, doc/pdftops.1, doc/pdftops.cat, doc/pdftotext.1,
doc/pdftotext.cat, doc/pdftotext.hlp, doc/xpdf.1, doc/xpdf.cat,
doc/xpdf.hlp, doc/xpdfrc.5, doc/xpdfrc.cat, doc/xpdfrc.hlp: update
Diffstat (limited to 'pdf/goo')
-rw-r--r-- | pdf/goo/Makefile.am | 1 | ||||
-rw-r--r-- | pdf/goo/gfile.cc | 28 |
2 files changed, 18 insertions, 11 deletions
diff --git a/pdf/goo/Makefile.am b/pdf/goo/Makefile.am index 24f89d8..b08ca56 100644 --- a/pdf/goo/Makefile.am +++ b/pdf/goo/Makefile.am @@ -5,6 +5,7 @@ libgoo_a_SOURCES = \ GHash.h \ GList.cc \ GList.h \ + GMutex.h \ GString.cc \ GString.h \ gmempp.cc \ diff --git a/pdf/goo/gfile.cc b/pdf/goo/gfile.cc index d6d2363..e6603c6 100644 --- a/pdf/goo/gfile.cc +++ b/pdf/goo/gfile.cc @@ -447,8 +447,6 @@ GBool openTempFile(GString **name, FILE **f, char *mode, char *ext) { #if defined(WIN32) //---------- Win32 ---------- char *s; - char buf[_MAX_PATH]; - char *fp; if (!(s = _tempnam(getenv("TEMP"), NULL))) { return gFalse; @@ -646,10 +644,8 @@ GDir::~GDir() { } GDirEntry *GDir::getNextEntry() { - struct dirent *ent; GDirEntry *e; - e = NULL; #if defined(WIN32) e = new GDirEntry(path->getCString(), ffd.cFileName, doStat); if (hnd && !FindNextFile(hnd, &ffd)) { @@ -658,24 +654,34 @@ GDirEntry *GDir::getNextEntry() { } #elif defined(ACORN) #elif defined(MACOS) -#else +#elif defined(VMS) + struct dirent *ent; + e = NULL; if (dir) { -#ifdef VMS if (needParent) { e = new GDirEntry(path->getCString(), "-", doStat); needParent = gFalse; return e; } -#endif ent = readdir(dir); -#ifndef VMS - if (ent && !strcmp(ent->d_name, ".")) + if (ent) { + e = new GDirEntry(path->getCString(), ent->d_name, doStat); + } + } +#else + struct dirent *ent; + e = NULL; + if (dir) { + ent = readdir(dir); + if (ent && !strcmp(ent->d_name, ".")) { ent = readdir(dir); -#endif - if (ent) + } + if (ent) { e = new GDirEntry(path->getCString(), ent->d_name, doStat); + } } #endif + return e; } |