Revision: 5555 http://geany.svn.sourceforge.net/geany/?rev=5555&view=rev Author: colombanw Date: 2011-03-05 22:40:50 +0000 (Sat, 05 Mar 2011)

Log Message: ----------- Move most of TagManager's I/O to MIO

Moved the parsers to MIO, which allows both in-memory and file parsing.

Modified Paths: -------------- trunk/configure.ac trunk/makefile.win32 trunk/src/Makefile.am trunk/src/makefile.win32 trunk/tagmanager/Makefile.am trunk/tagmanager/c.c trunk/tagmanager/entry.c trunk/tagmanager/entry.h trunk/tagmanager/fortran.c trunk/tagmanager/get.c trunk/tagmanager/get.h trunk/tagmanager/js.c trunk/tagmanager/lregex.c trunk/tagmanager/makefile.win32 trunk/tagmanager/parse.c trunk/tagmanager/read.c trunk/tagmanager/read.h trunk/tagmanager/sort.c trunk/tagmanager/sql.c trunk/tagmanager/strlist.c trunk/wscript

Added Paths: ----------- trunk/tagmanager/mio/ trunk/tagmanager/mio/COPYING trunk/tagmanager/mio/Makefile.am trunk/tagmanager/mio/README trunk/tagmanager/mio/makefile.win32 trunk/tagmanager/mio/mio-file.c trunk/tagmanager/mio/mio-memory.c trunk/tagmanager/mio/mio.c trunk/tagmanager/mio/mio.h

Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/configure.ac 2011-03-05 22:40:50 UTC (rev 5555) @@ -293,6 +293,7 @@ icons/scalable/Makefile tagmanager/Makefile tagmanager/include/Makefile +tagmanager/mio/Makefile scintilla/Makefile scintilla/include/Makefile src/Makefile

Modified: trunk/makefile.win32 =================================================================== --- trunk/makefile.win32 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/makefile.win32 2011-03-05 22:40:50 UTC (rev 5555) @@ -22,6 +22,7 @@ # Note: && is needed after cd because each line is executed in a different # shell. (cd .. is just for clarity). all: check-tools config.h + cd tagmanager\mio && $(MAKE) -f makefile.win32 && cd .... cd tagmanager && $(MAKE) -f makefile.win32 && cd .. cd scintilla && $(MAKE) -f makefile.win32 && cd .. cd plugins && $(MAKE) -f makefile.win32 && cd .. @@ -37,13 +38,14 @@ $(CP) $< $@

deps: - -$(RM) tagmanager\deps.mak scintilla\deps.mak plugins\deps.mak src\deps.mak + -$(RM) tagmanager\mio\deps.mak tagmanager\deps.mak scintilla\deps.mak plugins\deps.mak src\deps.mak

# used by src/makefile.win32 to avoid del ../file which is an error clean-local: -$(RM) geany_private.res geany.exe

clean: deps + cd tagmanager\mio && $(MAKE) -f makefile.win32 clean && cd .... cd tagmanager && $(MAKE) -f makefile.win32 clean && cd .. cd scintilla && $(MAKE) -f makefile.win32 clean && cd .. cd plugins && $(MAKE) -f makefile.win32 clean && cd ..

Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/src/Makefile.am 2011-03-05 22:40:50 UTC (rev 5555) @@ -74,7 +74,7 @@

INCLUDES = -I$(top_srcdir) -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include \ - @GTK_CFLAGS@ @GIO_CFLAGS@ + -I$(topsrcdir)/tagmanager/mio @GTK_CFLAGS@ @GIO_CFLAGS@

# tell automake we have a C++ file so it uses the C++ linker we need for Scintilla nodist_EXTRA_geany_SOURCES = dummy.cxx @@ -85,8 +85,8 @@

geany_SOURCES = $(SRCS) win32.c win32.h

-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ \ - $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 geany_private.res +geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ + @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 geany_private.res

AM_CFLAGS = -DGEANY_DATADIR="data" \ -DGEANY_DOCDIR="" \ @@ -112,7 +112,8 @@

geany_SOURCES = $(SRCS) vte.c vte.h

-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS) +geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ + @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS)

AM_CFLAGS = -DGEANY_DATADIR=""$(datadir)"" \ -DGEANY_DOCDIR=""$(docdir)"" \

Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/src/makefile.win32 2011-03-05 22:40:50 UTC (rev 5555) @@ -32,6 +32,7 @@

INCLUDEDIRS= -I.. \ -I../scintilla/include \ + -I../tagmanager/mio \ -I../tagmanager/include \ $(GTK_INCLUDES)

@@ -92,8 +93,8 @@

$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(CXX) $(OBJS) $(RES) -o $(TARGET) \ - ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(ALL_GTK_LIBS) \ - $(WIN_LIBS) + ../scintilla/scintilla.a ../tagmanager/mio∕mio.a ../tagmanager/tagmanager.a \ + $(ALL_GTK_LIBS) $(WIN_LIBS)

deps.mak: $(CC) -MM $(CFLAGS) *.c >deps.mak

Modified: trunk/tagmanager/Makefile.am =================================================================== --- trunk/tagmanager/Makefile.am 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/tagmanager/Makefile.am 2011-03-05 22:40:50 UTC (rev 5555) @@ -1,8 +1,8 @@ ## Process this file with automake to produce Makefile.in # $Id$

-SUBDIRS = include -INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) +SUBDIRS = mio include +INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) -I$(srcdir)/mio -I$(srcdir)

AM_CFLAGS = -DG_LOG_DOMAIN=""Tagmanager""

Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/tagmanager/c.c 2011-03-05 22:40:50 UTC (rev 5555) @@ -16,6 +16,7 @@

#include <string.h> #include <setjmp.h> +#include <mio/mio.h>

#include "entry.h" #include "get.h" @@ -180,8 +181,7 @@ keywordId keyword; vString* name; /* the name of the token */ unsigned long lineNumber; /* line number of tag */ - fpos_t filePosition; /* file position of line containing name */ - int bufferPosition; /* buffer position of line containing name */ + MIOPos filePosition; /* file position of line containing name */ } tokenInfo;

typedef enum eImplementation @@ -602,10 +602,7 @@ token->type = TOKEN_NONE; token->keyword = KEYWORD_NONE; token->lineNumber = getSourceLineNumber(); - if (useFile()) - token->filePosition = getInputFilePosition(); - else - token->bufferPosition = getInputBufferPosition(); + token->filePosition = getInputFilePosition(); vStringClear(token->name); }

@@ -1236,16 +1233,8 @@ if ((TRUE == st->gotArgs) && (TRUE == Option.extensionFields.argList) && ((TAG_FUNCTION == type) || (TAG_METHOD == type) || (TAG_PROTOTYPE == type))) { - if (useFile()) - { - tag->extensionFields.arglist = getArglistFromFilePos( + tag->extensionFields.arglist = getArglistFromFilePos( tag->filePosition, tag->name); - } - else - { - tag->extensionFields.arglist = getArglistFromBufferPos( - tag->bufferPosition, tag->name); - } } break; } @@ -1424,10 +1413,7 @@ initTagEntry (&e, vStringValue (token->name));

e.lineNumber = token->lineNumber; - if (useFile()) - e.filePosition = token->filePosition; - else - e.bufferPosition = token->bufferPosition; + e.filePosition = token->filePosition; e.isFileScope = isFileScope; e.kindName = tagName (type); e.kind = tagLetter (type); @@ -1894,10 +1880,7 @@ { dest->type = src->type; dest->keyword = src->keyword; - if (useFile()) - dest->filePosition = src->filePosition; - else - dest->bufferPosition = src->bufferPosition; + dest->filePosition = src->filePosition; dest->lineNumber = src->lineNumber; vStringCopy (dest->name, src->name); } @@ -2487,12 +2470,7 @@ } if (st->argEndPosition == 0) { - if (useFile()) - st->argEndPosition = ftell(File.fp); - else - /* FIXME File.fpBufferPosition is wrong here, this breaks function signatures and - * so Geany's calltips */ - st->argEndPosition = File.fpBufferPosition; + st->argEndPosition = mio_tell(File.mio); }

if (! info->isNameCandidate)

Modified: trunk/tagmanager/entry.c =================================================================== --- trunk/tagmanager/entry.c 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/tagmanager/entry.c 2011-03-05 22:40:50 UTC (rev 5555) @@ -127,8 +127,8 @@ const char *const fileName, const char *const pattern) { - const int length = fprintf (TagFile.fp, "%s%s\t%s\t/%s/\n", - PSEUDO_TAG_PREFIX, tagName, fileName, pattern); + const int length = mio_printf (TagFile.mio, "%s%s\t%s\t/%s/\n", + PSEUDO_TAG_PREFIX, tagName, fileName, pattern); ++TagFile.numTags.added; rememberMaxLengths (strlen (tagName), (size_t) length); } @@ -159,7 +159,7 @@ }

static void updateSortedFlag (const char *const line, - FILE *const fp, fpos_t startOfLine) + MIO *const mio, MIOPos startOfLine) { const char *const tab = strchr (line, '\t');

@@ -169,27 +169,27 @@

if (line [boolOffset] == '0' || line [boolOffset] == '1') { - fpos_t nextLine; + MIOPos nextLine;

- if (fgetpos (fp, &nextLine) == -1 || fsetpos (fp, &startOfLine) == -1) + if (mio_getpos (mio, &nextLine) == -1 || mio_setpos (mio, &startOfLine) == -1) error (WARNING, "Failed to update 'sorted' pseudo-tag"); else { - fpos_t flagLocation; + MIOPos flagLocation; int c, d;

do - c = fgetc (fp); + c = mio_getc (mio); while (c != '\t' && c != '\n'); - fgetpos (fp, &flagLocation); - d = fgetc (fp); + mio_getpos (mio, &flagLocation); + d = mio_getc (mio); if (c == '\t' && (d == '0' || d == '1') && d != (int) Option.sorted) { - fsetpos (fp, &flagLocation); - fputc (Option.sorted ? '1' : '0', fp); + mio_setpos (mio, &flagLocation); + mio_putc (mio, Option.sorted ? '1' : '0'); } - fsetpos (fp, &nextLine); + mio_setpos (mio, &nextLine); } } } @@ -198,12 +198,12 @@ /* Look through all line beginning with "!_TAG_FILE", and update those which * require it. */ -static long unsigned int updatePseudoTags (FILE *const fp) +static long unsigned int updatePseudoTags (MIO *const mio) { enum { maxClassLength = 20 }; char class [maxClassLength + 1]; unsigned long linesRead = 0; - fpos_t startOfLine; + MIOPos startOfLine; size_t classLength; const char *line;

@@ -211,8 +211,8 @@ classLength = strlen (class); Assert (classLength < maxClassLength);

- fgetpos (fp, &startOfLine); - line = readLine (TagFile.vLine, fp); + mio_getpos (mio, &startOfLine); + line = readLine (TagFile.vLine, mio); while (line != NULL && line [0] == class [0]) { ++linesRead; @@ -224,16 +224,16 @@ tab == '\t') { if (strcmp (classType, "_SORTED") == 0) - updateSortedFlag (line, fp, startOfLine); + updateSortedFlag (line, mio, startOfLine); } - fgetpos (fp, &startOfLine); + mio_getpos (mio, &startOfLine); } - line = readLine (TagFile.vLine, fp); + line = readLine (TagFile.vLine, mio); } while (line != NULL) /* skip to end of file */ { ++linesRead; - line = readLine (TagFile.vLine, fp); + line = readLine (TagFile.vLine, mio); } return linesRead; } @@ -247,22 +247,22 @@ static boolean isTagFile (const char *const filename) { boolean ok = FALSE; /* we assume not unless confirmed */ - FILE *const fp = g_fopen (filename, "rb"); + MIO *const mio = mio_new_file_full (filename, "rb", g_fopen, fclose);

- if (fp == NULL && errno == ENOENT) + if (mio == NULL && errno == ENOENT) ok = TRUE; - else if (fp != NULL) + else if (mio != NULL) { - const char *line = readLine (TagFile.vLine, fp); + const char *line = readLine (TagFile.vLine, mio);

if (line == NULL) ok = TRUE; - fclose (fp); + mio_free (mio); } return ok; }

-extern void copyBytes (FILE* const fromFp, FILE* const toFp, const long size) +extern void copyBytes (MIO* const fromMio, MIO* const toMio, const long size) { enum { BufferSize = 1000 }; long toRead, numRead; @@ -272,8 +272,8 @@ { toRead = (0 < remaining && remaining < BufferSize) ? remaining : BufferSize; - numRead = fread (buffer, (size_t) 1, (size_t) toRead, fromFp); - if (fwrite (buffer, (size_t)1, (size_t)numRead, toFp) < (size_t)numRead) + numRead = mio_read (fromMio, buffer, (size_t) 1, (size_t) toRead); + if (mio_write (toMio, buffer, (size_t)1, (size_t)numRead) < (size_t)numRead) error (FATAL | PERROR, "cannot complete write"); if (remaining > 0) remaining -= numRead; @@ -283,20 +283,20 @@

extern void copyFile (const char *const from, const char *const to, const long size) { - FILE* const fromFp = g_fopen (from, "rb"); - if (fromFp == NULL) + MIO* const fromMio = mio_new_file_full (from, "rb", g_fopen, fclose); + if (fromMio == NULL) error (FATAL | PERROR, "cannot open file to copy"); else { - FILE* const toFp = g_fopen (to, "wb"); - if (toFp == NULL) + MIO* const toMio = mio_new_file_full (to, "wb", g_fopen, fclose); + if (toMio == NULL) error (FATAL | PERROR, "cannot open copy destination"); else { - copyBytes (fromFp, toFp, size); - fclose (toFp); + copyBytes (fromMio, toMio, size); + mio_free (toMio); } - fclose (fromFp); + mio_free (fromMio); } }

@@ -311,7 +311,12 @@ /* Open the tags file. */ if (TagsToStdout) - TagFile.fp = tempFile ("w", &TagFile.name); + { + FILE *fp; + + fp = tempFile ("w", &TagFile.name); + TagFile.mio = mio_new_fp (fp, fclose); + } else { boolean fileExists; @@ -324,24 +329,24 @@ ""%s" doesn't look like a tag file; I refuse to overwrite it.", TagFile.name);

- if (Option.append && fileExists) - { - TagFile.fp = g_fopen (TagFile.name, "r+"); - if (TagFile.fp != NULL) + if (Option.append && fileExists) { - TagFile.numTags.prev = updatePseudoTags (TagFile.fp); - fclose (TagFile.fp); - TagFile.fp = g_fopen (TagFile.name, "a+"); + TagFile.mio = mio_new_file_full (TagFile.name, "r+", g_fopen, fclose); + if (TagFile.mio != NULL) + { + TagFile.numTags.prev = updatePseudoTags (TagFile.mio); + mio_free (TagFile.mio); + TagFile.mio = mio_new_file_full (TagFile.name, "a+", g_fopen, fclose); + } } - } - else - { - TagFile.fp = g_fopen (TagFile.name, "w"); - if (TagFile.fp != NULL) - addPseudoTags (); - } + else + { + TagFile.mio = mio_new_file_full (TagFile.name, "w", g_fopen, fclose); + if (TagFile.mio != NULL) + addPseudoTags (); + }

- if (TagFile.fp == NULL) + if (TagFile.mio == NULL) { error (FATAL | PERROR, "cannot open tag file"); exit (1); @@ -409,7 +414,6 @@ e->lineNumber = getSourceLineNumber (); e->language = getSourceLanguageName (); e->filePosition = getInputFilePosition (); - e->bufferPosition = getInputBufferPosition (); e->sourceFileName = getSourceFileTagPath (); e->name = name; }

Modified: trunk/tagmanager/entry.h =================================================================== --- trunk/tagmanager/entry.h 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/tagmanager/entry.h 2011-03-05 22:40:50 UTC (rev 5555) @@ -15,7 +15,7 @@ */ #include "general.h" /* must always come first */

-#include <stdio.h> +#include <mio/mio.h>

#include "vstring.h"

@@ -33,12 +33,12 @@ typedef struct eTagFile { char *name; char *directory; - FILE *fp; + MIO *mio; struct sNumTags { unsigned long added, prev; } numTags; struct sMax { size_t line, tag, file; } max; struct sEtags { char *name; - FILE *fp; + MIO *mio; size_t byteCount; } etags; vString *vLine; @@ -55,7 +55,7 @@ typedef struct sTagEntryInfo { boolean lineNumberEntry;/* pattern or line number entry */ unsigned long lineNumber; /* line number of tag */ - fpos_t filePosition; /* file position of line containing tag */ + MIOPos filePosition; /* file position of line containing tag */ int bufferPosition; /* buffer position of line containing tag */ const char* language; /* language of source file */ boolean isFileScope; /* is tag visibile only within source file? */ @@ -88,7 +88,7 @@ */ extern void freeTagFileResources (void); extern const char *tagFileName (void); -extern void copyBytes (FILE* const fromFp, FILE* const toFp, const long size); +extern void copyBytes (MIO* const fromMio, MIO* const toMio, const long size); extern void copyFile (const char *const from, const char *const to, const long size); extern void openTagFile (void); extern void closeTagFile (const boolean resize);

Modified: trunk/tagmanager/fortran.c =================================================================== --- trunk/tagmanager/fortran.c 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/tagmanager/fortran.c 2011-03-05 22:40:50 UTC (rev 5555) @@ -19,6 +19,7 @@ #include <limits.h> #include <ctype.h> /* to define tolower () */ #include <setjmp.h> +#include <mio/mio.h>

#include "entry.h" #include "keyword.h" @@ -183,8 +184,7 @@ vString* string; struct sTokenInfo *secondary; unsigned long lineNumber; - fpos_t filePosition; - int bufferPosition; /* buffer position of line containing name */ + MIOPos filePosition; } tokenInfo;

/* @@ -423,10 +423,7 @@ token->string = vStringNew (); token->secondary = NULL; token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition ();

return token; } @@ -480,10 +477,7 @@ e.lineNumberEntry = (boolean) (Option.locate != EX_PATTERN);

e.lineNumber = token->lineNumber; - if (useFile()) - e.filePosition = token->filePosition; - else - e.bufferPosition = token->bufferPosition; + e.filePosition = token->filePosition; e.isFileScope = isFileScope (token->tag); e.kindName = FortranKinds [token->tag].name; e.kind = FortranKinds [token->tag].letter; @@ -959,10 +953,7 @@ c = getChar ();

token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition ();

switch (c) {

Modified: trunk/tagmanager/get.c =================================================================== --- trunk/tagmanager/get.c 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/tagmanager/get.c 2011-03-05 22:40:50 UTC (rev 5555) @@ -314,14 +314,8 @@ e.kind = 'd'; if (parameterized) { - if (useFile()) { - e.extensionFields.arglist = getArglistFromFilePos(getInputFilePosition() - , e.name); - } - else { - e.extensionFields.arglist = getArglistFromBufferPos(getInputBufferPosition() - , e.name); - } + e.extensionFields.arglist = getArglistFromFilePos(getInputFilePosition() + , e.name); } makeTagEntry (&e); if (parameterized) @@ -715,63 +709,30 @@ return c; }

-extern char *getArglistFromBufferPos(int startPosition, const char *tokenName) +extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName) { - int bufferOriginalPosition; + MIOPos originalPosition; char *result = NULL; char *arglist = NULL; long pos1, pos2;

- /* FIXME startPosition as well as getBufPos() are mostly wrong here */ - pos2 = getBufPos(); + pos2 = mio_tell(File.mio);

- if (!useFile()) { - bufferOriginalPosition = getBufPos (); - setBufPos(startPosition); - pos1 = File.fpBufferPosition; - } - else - return NULL; + mio_getpos(File.mio, &originalPosition); + mio_setpos(File.mio, &startPosition); + pos1 = mio_tell(File.mio);

if (pos2 > pos1) { result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 2)); - if (result != NULL) + if (result != NULL && mio_read(File.mio, result, sizeof(char), pos2 - pos1 + 1) > 0) { - memcpy(result, &File.fpBuffer[getBufPos()], pos2 - pos1 + 1); result[pos2-pos1+1] = '\0'; arglist = getArglistFromStr(result, tokenName); - g_free(result); } - } - setBufPos (bufferOriginalPosition); - return arglist; -} - -extern char *getArglistFromFilePos(fpos_t startPosition, const char *tokenName) -{ - fpos_t originalPosition; - char *result = NULL; - char *arglist = NULL; - long pos1, pos2; - - pos2 = ftell(File.fp); - - fgetpos(File.fp, &originalPosition); - fsetpos(File.fp, &startPosition); - pos1 = ftell(File.fp); - - if (pos2 > pos1) - { - result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 2)); - if (result != NULL && fread(result, sizeof(char), pos2 - pos1 + 1, File.fp) > 0) - { - result[pos2-pos1+1] = '\0'; - arglist = getArglistFromStr(result, tokenName); - } g_free(result); } - fsetpos(File.fp, &originalPosition); + mio_setpos(File.mio, &originalPosition); return arglist; }

Modified: trunk/tagmanager/get.h =================================================================== --- trunk/tagmanager/get.h 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/tagmanager/get.h 2011-03-05 22:40:50 UTC (rev 5555) @@ -45,8 +45,7 @@ extern void cppUngetc (const int c); extern int cppGetc (void); extern int skipOverCComment (void); -extern char *getArglistFromFilePos(fpos_t startPosition, const char *tokenName); -extern char *getArglistFromBufferPos(int startPosition, const char *tokenName); +extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName); extern char *getArglistFromStr(char *buf, const char *name);

#endif /* _GET_H */

Modified: trunk/tagmanager/js.c =================================================================== --- trunk/tagmanager/js.c 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/tagmanager/js.c 2011-03-05 22:40:50 UTC (rev 5555) @@ -21,6 +21,7 @@ #include "general.h" /* must always come first */ #include <ctype.h> /* to define isalpha () */ #include <setjmp.h> +#include <mio/mio.h> #ifdef DEBUG #include <stdio.h> #endif @@ -107,10 +108,9 @@ vString * string; vString * scope; unsigned long lineNumber; - fpos_t filePosition; + MIOPos filePosition; int nestLevel; boolean ignoreTag; - int bufferPosition; /* buffer position of line containing name */ } tokenInfo;

/* @@ -198,10 +198,7 @@ token->nestLevel = 0; token->ignoreTag = FALSE; token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition ();

return token; } @@ -357,11 +354,8 @@ { c = fileGetc (); token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); - } + token->filePosition = getInputFilePosition (); + } while (c == '\t' || c == ' ' || c == '\n');

switch (c) @@ -384,10 +378,7 @@ token->type = TOKEN_STRING; parseString (token->string, c); token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition (); break;

case '\': @@ -396,10 +387,7 @@ fileUngetc (c); token->type = TOKEN_CHARACTER; token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition (); break;

case '/': @@ -442,10 +430,7 @@ { parseIdentifier (token->string, c); token->lineNumber = getSourceLineNumber (); - if (useFile()) - token->filePosition = getInputFilePosition (); - else - token->bufferPosition = getInputBufferPosition (); + token->filePosition = getInputFilePosition (); token->keyword = analyzeToken (token->string); if (isKeyword (token, KEYWORD_NONE)) token->type = TOKEN_IDENTIFIER; @@ -460,10 +445,7 @@ { dest->nestLevel = src->nestLevel; dest->lineNumber = src->lineNumber; - if (useFile()) - dest->filePosition = src->filePosition; - else - dest->bufferPosition = src->bufferPosition; + dest->filePosition = src->filePosition; dest->type = src->type; dest->keyword = src->keyword; vStringCopy(dest->string, src->string);

Modified: trunk/tagmanager/lregex.c =================================================================== --- trunk/tagmanager/lregex.c 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/tagmanager/lregex.c 2011-03-05 22:40:50 UTC (rev 5555) @@ -20,6 +20,7 @@

#include <string.h> #include <glib.h> +#include <mio/mio.h>

#ifdef HAVE_REGCOMP # include <ctype.h> @@ -410,15 +411,15 @@ else { const char* regexfile = parameter + 1; - FILE* const fp = fopen (regexfile, "r"); - if (fp == NULL) + MIO* const mio = mio_new_file (regexfile, "r"); + if (mio == NULL) printf ("regex: %s\n", regexfile); else { vString* const regex = vStringNew (); - while (readLine (regex, fp)) + while (readLine (regex, mio)) addLanguageRegex (language, vStringValue (regex)); - fclose (fp); + mio_free (mio); vStringDelete (regex); } }

Modified: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 2011-03-02 22:58:02 UTC (rev 5554) +++ trunk/tagmanager/makefile.win32 2011-03-05 22:40:50 UTC (rev 5555) @@ -22,7 +22,7 @@ -I$(PREFIX)/include/gettext \ -I$(PREFIX)/include

-INCLUDEDIRS=-I include $(GTK_INCLUDES) +INCLUDEDIRS=-I include -I mio -I . $(GTK_INCLUDES)

CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE="geany" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS) ifdef DEBUG

Added: trunk/tagmanager/mio/COPYING =================================================================== --- trunk/tagmanager/mio/COPYING (rev 0) +++ trunk/tagmanager/mio/COPYING 2011-03-05 22:40:50 UTC (rev 5555) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/ + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see http://www.gnu.org/licenses/. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +http://www.gnu.org/licenses/. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +http://www.gnu.org/philosophy/why-not-lgpl.html.

Property changes on: trunk/tagmanager/mio/COPYING ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

Added: trunk/tagmanager/mio/Makefile.am =================================================================== --- trunk/tagmanager/mio/Makefile.am (rev 0) +++ trunk/tagmanager/mio/Makefile.am 2011-03-05 22:40:50 UTC (rev 5555) @@ -0,0 +1,13 @@ +# $id$ + +noinst_LIBRARIES = libmio.a + +AM_CPPFLAGS = -DG_LOG_DOMAIN="MIO" #-DMIO_DEBUG +AM_CFLAGS = $(GTK_CFLAGS) + +libmio_a_SOURCES = mio.c + +EXTRA_DIST = \ + mio.h \ + mio-file.c + mio-memory.c

Property changes on: trunk/tagmanager/mio/Makefile.am ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

Added: trunk/tagmanager/mio/README =================================================================== --- trunk/tagmanager/mio/README (rev 0) +++ trunk/tagmanager/mio/README 2011-03-05 22:40:50 UTC (rev 5555) @@ -0,0 +1,3 @@ +These files are from the MIO library, http://gitorious.org/mio + +See COPYING for the MIO license.

Property changes on: trunk/tagmanager/mio/README ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

Added: trunk/tagmanager/mio/makefile.win32 =================================================================== --- trunk/tagmanager/mio/makefile.win32 (rev 0) +++ trunk/tagmanager/mio/makefile.win32 2011-03-05 22:40:50 UTC (rev 5555) @@ -0,0 +1,48 @@ + +.SUFFIXES: .cxx .c .o .h .a +CC = gcc +AR = ar +RANLIB = ranlib +PREFIX = C:\libs +RM = del +-include ../../localwin32.mk + +COMPLIB=mio.a + +GTK_INCLUDES= \ + -I$(PREFIX)/include/gtk-2.0 \ + -I$(PREFIX)/lib/gtk-2.0/include \ + -I$(PREFIX)/include/atk-1.0 \ + -I$(PREFIX)/include/pango-1.0 \ + -I$(PREFIX)/include/cairo \ + -I$(PREFIX)/include/glib-2.0 \ + -I$(PREFIX)/lib/glib-2.0/include \ + -I$(PREFIX)/include/gettext \ + -I$(PREFIX)/include + +INCLUDEDIRS=-I include $(GTK_INCLUDES) + +CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE="geany" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS) +ifdef DEBUG +CFLAGS= -O0 -g $(CBASEFLAGS) +else +CFLAGS=-O2 $(CBASEFLAGS) +endif + +.c.o: + $(CC) $(CFLAGS) -w -c $< + +all: $(COMPLIB) + +clean: + -$(RM) deps.mak *.o $(COMPLIB) + +$(COMPLIB): mio.o + $(AR) rc $@ $^ + $(RANLIB) $@ + +deps.mak: + $(CC) -MM $(CFLAGS) *.c >deps.mak + +# Generate header dependencies with "make deps.mak" +include deps.mak

Property changes on: trunk/tagmanager/mio/makefile.win32 ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

Added: trunk/tagmanager/mio/mio-file.c =================================================================== --- trunk/tagmanager/mio/mio-file.c (rev 0) +++ trunk/tagmanager/mio/mio-file.c 2011-03-05 22:40:50 UTC (rev 5555) @@ -0,0 +1,174 @@ +/* + * MIO, an I/O abstraction layer replicating C file I/O API. + * Copyright (C) 2010 Colomban Wendling ban@herbesfolles.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +/* file IO implementation */ + +#include <glib.h> +#include <stdarg.h> +#include <stdio.h> +#include <errno.h> + +#include "mio.h" + + +#define FILE_SET_VTABLE(mio) \ + G_STMT_START { \ + mio->v_free = file_free; \ + mio->v_read = file_read; \ + mio->v_write = file_write; \ + mio->v_getc = file_getc; \ + mio->v_gets = file_gets; \ + mio->v_ungetc = file_ungetc; \ + mio->v_putc = file_putc; \ + mio->v_puts = file_puts; \ + mio->v_vprintf = file_vprintf; \ + mio->v_clearerr = file_clearerr; \ + mio->v_eof = file_eof; \ + mio->v_error = file_error; \ + mio->v_seek = file_seek; \ + mio->v_tell = file_tell; \ + mio->v_rewind = file_rewind; \ + mio->v_getpos = file_getpos; \ + mio->v_setpos = file_setpos; \ + } G_STMT_END + + +static void +file_free (MIO *mio) +{ + if (mio->impl.file.close_func) { + mio->impl.file.close_func (mio->impl.file.fp); + } + mio->impl.file.close_func = NULL; + mio->impl.file.fp = NULL; +} + +static gsize +file_read (MIO *mio, + void *ptr, + gsize size, + gsize nmemb) +{ + return fread (ptr, size, nmemb, mio->impl.file.fp); +} + +static gsize +file_write (MIO *mio, + const void *ptr, + gsize size, + gsize nmemb) +{ + return fwrite (ptr, size, nmemb, mio->impl.file.fp); +} + +static gint +file_putc (MIO *mio, + gint c) +{ + return fputc (c, mio->impl.file.fp); +} + +static gint +file_puts (MIO *mio, + const gchar *s) +{ + return fputs (s, mio->impl.file.fp); +} + +static gint +file_vprintf (MIO *mio, + const gchar *format, + va_list ap) +{ + return vfprintf (mio->impl.file.fp, format, ap); +} + +static gint +file_getc (MIO *mio) +{ + return fgetc (mio->impl.file.fp); +} + +static gint +file_ungetc (MIO *mio, + gint ch) +{ + return ungetc (ch, mio->impl.file.fp); +} + +static gchar * +file_gets (MIO *mio, + gchar *s, + gsize size) +{ + return fgets (s, (int)size, mio->impl.file.fp); +} + +static void +file_clearerr (MIO *mio) +{ + clearerr (mio->impl.file.fp); +} + +static gint +file_eof (MIO *mio) +{ + return feof (mio->impl.file.fp); +} + +static gint +file_error (MIO *mio) +{ + return ferror (mio->impl.file.fp); +} + +static gint +file_seek (MIO *mio, + glong offset, + gint whence) +{ + return fseek (mio->impl.file.fp, offset, whence); +} + +static glong +file_tell (MIO *mio) +{ + return ftell (mio->impl.file.fp); +} + +static void +file_rewind (MIO *mio) +{ + rewind (mio->impl.file.fp); +} + +static gint +file_getpos (MIO *mio, + MIOPos *pos) +{ + return fgetpos (mio->impl.file.fp, &pos->impl.file); +} + +static gint +file_setpos (MIO *mio, + MIOPos *pos) +{ + return fsetpos (mio->impl.file.fp, &pos->impl.file); +}

Property changes on: trunk/tagmanager/mio/mio-file.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

Added: trunk/tagmanager/mio/mio-memory.c =================================================================== --- trunk/tagmanager/mio/mio-memory.c (rev 0) +++ trunk/tagmanager/mio/mio-memory.c 2011-03-05 22:40:50 UTC (rev 5555) @@ -0,0 +1,481 @@ +/* + * MIO, an I/O abstraction layer replicating C file I/O API. + * Copyright (C) 2010 Colomban Wendling ban@herbesfolles.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +/* memory IO implementation */ + +#include <glib.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include "mio.h" + + +#define MEM_SET_VTABLE(mio) \ + G_STMT_START { \ + mio->v_free = mem_free; \ + mio->v_read = mem_read; \ + mio->v_write = mem_write; \ + mio->v_getc = mem_getc; \ + mio->v_gets = mem_gets; \ + mio->v_ungetc = mem_ungetc; \ + mio->v_putc = mem_putc; \ + mio->v_puts = mem_puts; \ + mio->v_vprintf = mem_vprintf; \ + mio->v_clearerr = mem_clearerr; \ + mio->v_eof = mem_eof; \ + mio->v_error = mem_error; \ + mio->v_seek = mem_seek; \ + mio->v_tell = mem_tell; \ + mio->v_rewind = mem_rewind; \ + mio->v_getpos = mem_getpos; \ + mio->v_setpos = mem_setpos; \ + } G_STMT_END + + +/* minimal reallocation chunk size */ +#define MIO_CHUNK_SIZE 4096 + + +static void +mem_free (MIO *mio) +{ + if (mio->impl.mem.free_func) { + mio->impl.mem.free_func (mio->impl.mem.buf); + } + mio->impl.mem.buf = NULL; + mio->impl.mem.pos = 0; + mio->impl.mem.size = 0; + mio->impl.mem.allocated_size = 0; + mio->impl.mem.realloc_func = NULL; + mio->impl.mem.free_func = NULL; + mio->impl.mem.eof = FALSE; + mio->impl.mem.error = FALSE; +} + +static gsize +mem_read (MIO *mio, + void *ptr, + gsize size, + gsize nmemb) +{ + gsize n_read = 0; + + if (size != 0 && nmemb != 0) { + if (mio->impl.mem.ungetch != EOF) { + *((guchar *)ptr) = (guchar)mio->impl.mem.ungetch; + mio->impl.mem.ungetch = EOF; + mio->impl.mem.pos++; + if (size == 1) { + n_read++; + } else if (mio->impl.mem.pos + (size - 1) <= mio->impl.mem.size) { + memcpy (&(((guchar *)ptr)[1]), + &mio->impl.mem.buf[mio->impl.mem.pos], size - 1); + mio->impl.mem.pos += size - 1; + n_read++; + } + } + for (; n_read < nmemb; n_read++) { + if (mio->impl.mem.pos + size > mio->impl.mem.size) { + break; + } else { + memcpy (&(((guchar *)ptr)[n_read * size]), + &mio->impl.mem.buf[mio->impl.mem.pos], size); + mio->impl.mem.pos += size; + } + } + if (mio->impl.mem.pos >= mio->impl.mem.size) { + mio->impl.mem.eof = TRUE; + } + } + + return n_read; +} + +/* + * mem_try_resize: + * @mio: A #MIO object of the type %MIO_TYPE_MEMORY + * @new_size: Requested new size + * + * Tries to resize the underlying buffer of an in-memory #MIO object. + * This supports both growing and shrinking. + * + * Returns: %TRUE on success, %FALSE otherwise. + */ +static gboolean +mem_try_resize (MIO *mio, + gsize new_size) +{ + gboolean success = FALSE; + + if (mio->impl.mem.realloc_func) { + if (G_UNLIKELY (new_size == G_MAXSIZE)) { + #ifdef EOVERFLOW + errno = EOVERFLOW; + #endif + } else { + if (new_size > mio->impl.mem.size) { + if (new_size <= mio->impl.mem.allocated_size) { + mio->impl.mem.size = new_size; + success = TRUE; + } else { + gsize newsize; + guchar *newbuf; + + newsize = MAX (mio->impl.mem.allocated_size + MIO_CHUNK_SIZE, + new_size); + newbuf = mio->impl.mem.realloc_func (mio->impl.mem.buf, newsize); + if (newbuf) { + mio->impl.mem.buf = newbuf; + mio->impl.mem.allocated_size = newsize; + mio->impl.mem.size = new_size; + success = TRUE; + } + } + } else { + guchar *newbuf; + + newbuf = mio->impl.mem.realloc_func (mio->impl.mem.buf, new_size); + if (G_LIKELY (newbuf || new_size == 0)) { + mio->impl.mem.buf = newbuf; + mio->impl.mem.allocated_size = new_size; + mio->impl.mem.size = new_size; + success = TRUE; + } + } + } + } + + return success; +} + +/* + * mem_try_ensure_space: + * @mio: A #MIO object + * @n: Requested size from the current (cursor) position + * + * Tries to ensure there is enough space for @n bytes to be written from the + * current cursor position. + * + * Returns: %TRUE if there is enough space, %FALSE otherwise. + */ +static gboolean +mem_try_ensure_space (MIO *mio, + gsize n) +{ + gboolean success = TRUE; + + if (mio->impl.mem.pos + n > mio->impl.mem.size) { + success = mem_try_resize (mio, mio->impl.mem.pos + n); + } + + return success; +} + +static gsize +mem_write (MIO *mio, + const void *ptr, + gsize size, + gsize nmemb) +{ + gsize n_written = 0; + + if (size != 0 && nmemb != 0) { + if (mem_try_ensure_space (mio, size * nmemb)) { + memcpy (&mio->impl.mem.buf[mio->impl.mem.pos], ptr, size * nmemb); + mio->impl.mem.pos += size * nmemb; + n_written = nmemb; + } + } + + return n_written; +} + +static gint +mem_putc (MIO *mio, + gint c) +{ + gint rv = EOF; + + if (mem_try_ensure_space (mio, 1)) { + mio->impl.mem.buf[mio->impl.mem.pos] = (guchar)c; + mio->impl.mem.pos++; + rv = (gint)((guchar)c); + } + + return rv; +} + +static gint +mem_puts (MIO *mio, + const gchar *s) +{ + gint rv = EOF; + gsize len; + + len = strlen (s); + if (mem_try_ensure_space (mio, len)) { + memcpy (&mio->impl.mem.buf[mio->impl.mem.pos], s, len); + mio->impl.mem.pos += len; + rv = 1; + } + + return rv; +} + +static gint +mem_vprintf (MIO *mio, + const gchar *format, + va_list ap) +{ + gint rv = -1; + gint n; + gchar tmp; + gsize old_pos; + gsize old_size; + va_list ap_copy; + + old_pos = mio->impl.mem.pos; + old_size = mio->impl.mem.size; + va_copy (ap_copy, ap); + /* compute the size we will need into the buffer */ + n = vsnprintf (&tmp, 1, format, ap_copy); + va_end (ap_copy); + if (n >= 0 && mem_try_ensure_space (mio, ((guint)n) + 1)) { + guchar c; + + /* backup character at n+1 that will be overwritten by a \0 ... */ + c = mio->impl.mem.buf[mio->impl.mem.pos + (guint)n]; + rv = vsnprintf ((gchar *)&mio->impl.mem.buf[mio->impl.mem.pos], + (guint)n + 1, format, ap); + /* ...and restore it */ + mio->impl.mem.buf[mio->impl.mem.pos + (guint)n] = c; + if (G_LIKELY (rv >= 0 && rv == n)) { + /* re-compute the actual size since we might have allocated one byte + * more than needed */ + mio->impl.mem.size = MAX (old_size, old_pos + (guint)rv); + mio->impl.mem.pos += (guint)rv; + } else { + mio->impl.mem.size = old_size; + rv = -1; + } + } + + return rv; +} + +static gint +mem_getc (MIO *mio) +{ + gint rv = EOF; + + if (mio->impl.mem.ungetch != EOF) { + rv = mio->impl.mem.ungetch; + mio->impl.mem.ungetch = EOF; + mio->impl.mem.pos++; + } else if (mio->impl.mem.pos < mio->impl.mem.size) { + rv = mio->impl.mem.buf[mio->impl.mem.pos]; + mio->impl.mem.pos++; + } else { + mio->impl.mem.eof = TRUE; + } + + return rv; +} + +static gint +mem_ungetc (MIO *mio, + gint ch) +{ + gint rv = EOF; + + if (ch != EOF && mio->impl.mem.ungetch == EOF) { + rv = mio->impl.mem.ungetch = ch; + mio->impl.mem.pos--; + mio->impl.mem.eof = FALSE; + } + + return rv; +} + +static gchar * +mem_gets (MIO *mio, + gchar *s, + gsize size) +{ + gchar *rv = NULL; + + if (size > 0) { + gsize i = 0; + + if (mio->impl.mem.ungetch != EOF) { + s[i] = (gchar)mio->impl.mem.ungetch; + mio->impl.mem.ungetch = EOF; + mio->impl.mem.pos++; + i++; + } + for (; mio->impl.mem.pos < mio->impl.mem.size && i < (size - 1); i++) { + s[i] = (gchar)mio->impl.mem.buf[mio->impl.mem.pos]; + mio->impl.mem.pos++; + if (s[i] == '\n') { + i++; + break; + } + } + if (i > 0) { + s[i] = 0; + rv = s; + } + if (mio->impl.mem.pos >= mio->impl.mem.size) { + mio->impl.mem.eof = TRUE; + } + } + + return rv; +} + +static void +mem_clearerr (MIO *mio) +{ + mio->impl.mem.error = FALSE; + mio->impl.mem.eof = FALSE; +} + +static gint +mem_eof (MIO *mio) +{ + return mio->impl.mem.eof != FALSE; +} + +static gint +mem_error (MIO *mio) +{ + return mio->impl.mem.error != FALSE; +} + +/* FIXME: should we support seeking out of bounds like lseek() seems to do? */ +static gint +mem_seek (MIO *mio, + glong offset, + gint whence) +{ + gint rv = -1; + + switch (whence) { + case SEEK_SET: + if (offset < 0 || (gsize)offset > mio->impl.mem.size) { + errno = EINVAL; + } else { + mio->impl.mem.pos = (gsize)offset; + rv = 0; + } + break; + + case SEEK_CUR: + if ((offset < 0 && (gsize)-offset > mio->impl.mem.pos) || + mio->impl.mem.pos + (gsize)offset > mio->impl.mem.size) { + errno = EINVAL; + } else { + mio->impl.mem.pos = (gsize)((gssize)mio->impl.mem.pos + offset); + rv = 0; + } + break; + + case SEEK_END: + if (offset > 0 || (gsize)-offset > mio->impl.mem.size) { + errno = EINVAL; + } else { + mio->impl.mem.pos = mio->impl.mem.size - (gsize)-offset; + rv = 0; + } + break; + + default: + errno = EINVAL; + } + if (rv == 0) { + mio->impl.mem.eof = FALSE; + mio->impl.mem.ungetch = EOF; + } + + return rv; +} + +static glong +mem_tell (MIO *mio) +{ + glong rv = -1; + + if (mio->impl.mem.pos > G_MAXLONG) { + #ifdef EOVERFLOW + errno = EOVERFLOW; + #endif + } else { + rv = (glong)mio->impl.mem.pos; + } + + return rv; +} + +static void +mem_rewind (MIO *mio) +{ + mio->impl.mem.pos = 0; + mio->impl.mem.ungetch = EOF; + mio->impl.mem.eof = FALSE; + mio->impl.mem.error = FALSE; +} + +static gint +mem_getpos (MIO *mio, + MIOPos *pos) +{ + gint rv = -1; + + if (mio->impl.mem.pos == (gsize)-1) { + /* this happens if ungetc() was called at the start of the stream */ + #ifdef EIO + errno = EIO; + #endif + } else { + pos->impl.mem = mio->impl.mem.pos; + rv = 0; + } + + return rv; +} + +static gint +mem_setpos (MIO *mio, + MIOPos *pos) +{ + gint rv = -1; + + if (pos->impl.mem > mio->impl.mem.size) { + errno = EINVAL; + } else { + mio->impl.mem.ungetch = EOF; + mio->impl.mem.pos = pos->impl.mem; + rv = 0; + } + + return rv; +}

Property changes on: trunk/tagmanager/mio/mio-memory.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

Added: trunk/tagmanager/mio/mio.c =================================================================== --- trunk/tagmanager/mio/mio.c (rev 0) +++ trunk/tagmanager/mio/mio.c 2011-03-05 22:40:50 UTC (rev 5555) @@ -0,0 +1,621 @@ +/* + * MIO, an I/O abstraction layer replicating C file I/O API. + * Copyright (C) 2010 Colomban Wendling ban@herbesfolles.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include "mio.h" +#include "mio-file.c" +#include "mio-memory.c" + +#include <glib.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> + + + +/** + * mio_new_file_full: + * @filename: Filename to open, passed as-is to @open_func as the first argument + * @mode: Mode in which open the file, passed as-is to @open_func as the second + * argument + * @open_func: A function with the fopen() semantic to use to open the file + * @close_func: A function with the fclose() semantic to close the file when + * the #MIO object is destroyed, or %NULL not to close the #FILE + * object + * + * Creates a new #MIO object working on a file, from a filename and an opening + * function. See also mio_new_file(). + * + * This function is generally overkill and mio_new_file() should often be used + * instead, but it allows to specify a custom function to open a file, as well + * as a close function. The former is useful e.g. if you need to wrap fopen() + * for some reason (like filename encoding conversion for example), and the + * latter allows you both to match your custom open function and to choose + * whether the underlying #FILE object should or not be closed when mio_free() + * is called on the returned object. + * + * Free-function: mio_free() + * + * Returns: A new #MIO on success, or %NULL on failure. + */ +MIO * +mio_new_file_full (const gchar *filename, + const gchar *mode, + MIOFOpenFunc open_func, + MIOFCloseFunc close_func) +{ + MIO *mio; + + /* we need to create the MIO object first, because we may not be able to close + * the opened file if the user passed NULL as the close function, which means + * that everything must succeed if we've opened the file successfully */ + mio = g_slice_alloc (sizeof *mio); + if (mio) { + FILE *fp = open_func (filename, mode); + + if (! fp) { + g_slice_free1 (sizeof *mio, mio); + mio = NULL; + } else { + mio->type = MIO_TYPE_FILE; + mio->impl.file.fp = fp; + mio->impl.file.close_func = close_func; + /* function table filling */ + FILE_SET_VTABLE (mio); + } + } + + return mio; +} + +/** + * mio_new_file: + * @filename: Filename to open, same as the fopen()'s first argument + * @mode: Mode in which open the file, fopen()'s second argument + * + * Creates a new #MIO object working on a file from a filename; wrapping + * fopen(). + * This function simply calls mio_new_file_full() with the libc's fopen() and + * fclose() functions. + * + * Free-function: mio_free() + * + * Returns: A new #MIO on success, or %NULL on failure. + */ +MIO * +mio_new_file (const gchar *filename, + const gchar *mode) +{ + return mio_new_file_full (filename, mode, fopen, fclose); +} + +/** + * mio_new_fp: + * @fp: An opened #FILE object + * @close_func: (allow-none): Function used to close @fp when the #MIO object + * gets destroyed, or %NULL not to close the #FILE object + * + * Creates a new #MIO object working on a file, from an already opened #FILE + * object. + * + * <example> + * <title>Typical use of this function</title> + * <programlisting> + * MIO *mio = mio_new_fp (fp, fclose); + * </programlisting> + * </example> + * + * Free-function: mio_free() + * + * Returns: A new #MIO on success or %NULL on failure. + */ +MIO * +mio_new_fp (FILE *fp, + MIOFCloseFunc close_func) +{ + MIO *mio; + + mio = g_slice_alloc (sizeof *mio); + if (mio) { + mio->type = MIO_TYPE_FILE; + mio->impl.file.fp = fp; + mio->impl.file.close_func = close_func; + /* function table filling */ + FILE_SET_VTABLE (mio); + } + + return mio; +} + +/** + * mio_new_memory: + * @data: Initial data (may be %NULL) + * @size: Length of @data in bytes + * @realloc_func: A function with the realloc() semantic used to grow the + * buffer, or %NULL to disable buffer growing + * @free_func: A function with the free() semantic to destroy the data together + * with the object, or %NULL not to destroy the data + * + * Creates a new #MIO object working on memory. + * + * To allow the buffer to grow, you must provide a @realloc_func, otherwise + * trying to write after the end of the current data will fail. + * + * If you want the buffer to be freed together with the #MIO object, you must + * give a @free_func; otherwise the data will still live after #MIO object + * termination. + * + * <example> + * <title>Basic creation of a non-growable, freeable #MIO object</title> + * <programlisting> + * MIO *mio = mio_new_memory (data, size, NULL, g_free); + * </programlisting> + * </example> + * + * <example> + * <title>Basic creation of an empty growable and freeable #MIO object</title> + * <programlisting> + * MIO *mio = mio_new_memory (NULL, 0, g_try_realloc, g_free); + * </programlisting> + * </example> + * + * Free-function: mio_free() + * + * Returns: A new #MIO on success, or %NULL on failure. + */ +MIO * +mio_new_memory (guchar *data, + gsize size, + MIOReallocFunc realloc_func, + GDestroyNotify free_func) +{ + MIO *mio; + + mio = g_slice_alloc (sizeof *mio); + if (mio) { + mio->type = MIO_TYPE_MEMORY; + mio->impl.mem.buf = data; + mio->impl.mem.ungetch = EOF; + mio->impl.mem.pos = 0; + mio->impl.mem.size = size; + mio->impl.mem.allocated_size = size; + mio->impl.mem.realloc_func = realloc_func; + mio->impl.mem.free_func = free_func; + mio->impl.mem.eof = FALSE; + mio->impl.mem.error = FALSE; + /* function table filling */ + MEM_SET_VTABLE (mio); + } + + return mio; +} + +/** + * mio_file_get_fp: + * @mio: A #MIO object + * + * Gets the underlying #FILE object associated with a #MIO file stream. + * + * <warning><para>The returned object may become invalid after a call to + * mio_free() if the stream was configured to close the file when + * destroyed.</para></warning> + * + * Returns: The underlying #FILE object of the given stream, or %NULL if the + * stream is not a file stream. + */ +FILE * +mio_file_get_fp (MIO *mio) +{ + FILE *fp = NULL; + + if (mio->type == MIO_TYPE_FILE) { + fp = mio->impl.file.fp; + } + + return fp; +} + +/** + * mio_memory_get_data: + * @mio: A #MIO object + * @size: (allow-none) (out): Return location for the length of the returned + * memory, or %NULL + * + * Gets the underlying memory buffer associated with a #MIO memory stream. + * + * <warning><para>The returned pointer and size may become invalid after a + * successful write on the stream or after a call to mio_free() if the stream + * was configured to free the memory when destroyed.</para></warning> + * + * Returns: The memory buffer of the given #MIO stream, or %NULL if the stream + * is not a memory stream. + */ +guchar * +mio_memory_get_data (MIO *mio, + gsize *size) +{ + guchar *ptr = NULL; + + if (mio->type == MIO_TYPE_MEMORY) { + ptr = mio->impl.mem.buf; + if (size) *size = mio->impl.mem.size; + } + + return ptr; +} + +/** + * mio_free: + * @mio: A #MIO object + * + * Destroys a #MIO object. + */ +void +mio_free (MIO *mio) +{ + if (mio) { + mio->v_free (mio); + g_slice_free1 (sizeof *mio, mio); + } +} + +/** + * mio_read: + * @mio: A #MIO object + * @ptr: Pointer to the memory to fill with the read data + * @size: Size of each block to read + * @nmemb: Number o blocks to read + * + * Reads raw data from a #MIO stream. This function behave the same as fread(). + * + * Returns: The number of actually read blocks. If an error occurs or if the + * end of the stream is reached, the return value may be smaller than + * the requested block count, or even 0. This function doesn't + * distinguish between end-of-stream and an error, you should then use + * mio_eof() and mio_error() to determine which occurred. + */ +gsize +mio_read (MIO *mio, + void *ptr, + gsize size, + gsize nmemb) +{ + return mio->v_read (mio, ptr, size, nmemb); +} + +/** + * mio_write: + * @mio: A #MIO object + * @ptr: Pointer to the memory to write on the stream + * @size: Size of each block to write + * @nmemb: Number of block to write + * + * Writes raw data to a #MIO stream. This function behaves the same as fwrite(). + * + * Returns: The number of blocks actually written to the stream. This might be + * smaller than the requested count if a write error occurs. + */ +gsize +mio_write (MIO *mio, + const void *ptr, + gsize size, + gsize nmemb) +{ + return mio->v_write (mio, ptr, size, nmemb); +} + +/** + * mio_putc: + * @mio: A #MIO object + * @c: The character to write + * + * Writes a character to a #MIO stream. This function behaves the same as + * fputc(). + * + * Returns: The written wharacter, or %EOF on error. + */ +gint +mio_putc (MIO *mio, + gint c) +{ + return mio->v_putc (mio, c); +} + +/** + * mio_puts: + * @mio: A #MIO object + * @s: The string to write + * + * Writes a string to a #MIO object. This function behaves the same as fputs(). + * + * Returns: A non-negative integer on success or %EOF on failure. + */ +gint +mio_puts (MIO *mio, + const gchar *s) +{ + return mio->v_puts (mio, s); +} + +/** + * mio_vprintf: + * @mio: A #MIO object + * @format: A printf fomrat string + * @ap: The variadic argument list for the format + * + * Writes a formatted string into a #MIO stream. This function behaves the same + * as vfprintf(). + * + * Returns: The number of bytes written in the stream, or a negative value on + * failure. + */ +gint +mio_vprintf (MIO *mio, + const gchar *format, + va_list ap) +{ + return mio->v_vprintf (mio, format, ap); +} + +/** + * mio_printf: + * @mio: A #MIO object + * @format: A print format string + * @...: Arguments of the format + * + * Writes a formatted string to a #MIO stream. This function behaves the same as + * fprintf(). + * + * Returns: The number of bytes written to the stream, or a negative value on + * failure. + */ +gint +mio_printf (MIO *mio, + const gchar *format, + ...) +{ + gint rv; + va_list ap; + + va_start (ap, format); + rv = mio->v_vprintf (mio, format, ap); + va_end (ap); + + return rv; +} + +/** + * mio_getc: + * @mio: A #MIO object + * + * Gets the current character from a #MIO stream. This function behaves the same + * as fgetc(). + * + * Returns: The read character as a #gint, or %EOF on error. + */ +gint +mio_getc (MIO *mio) +{ + return mio->v_getc (mio); +} + +/** + * mio_ungetc: + * @mio: A #MIO object + * @ch: Character to put back in the stream + * + * Puts a character back in a #MIO stream. This function behaves the sames as + * ungetc(). + * + * <warning><para>It is only guaranteed that one character can be but back at a + * time, even if the implementation may allow more.</para></warning> + * <warning><para>Using this function while the stream cursor is at offset 0 is + * not guaranteed to function properly. As the C99 standard says, it is "an + * obsolescent feature".</para></warning> + * + * Returns: The character put back, or %EOF on error. + */ +gint +mio_ungetc (MIO *mio, + gint ch) +{ + return mio->v_ungetc (mio, ch); +} + +/** + * mio_gets: + * @mio: A #MIO object + * @s: A string to fill with the read data + * @size: The maximum number of bytes to read + * + * Reads a string from a #MIO stream, stopping after the first new-line + * character or at the end of the stream. This function behaves the same as + * fgets(). + * + * Returns: @s on success, %NULL otherwise. + */ +gchar * +mio_gets (MIO *mio, + gchar *s, + gsize size) +{ + return mio->v_gets (mio, s, size); +} + +/** + * mio_clearerr: + * @mio: A #MIO object + * + * Clears the error and end-of-stream indicators of a #MIO stream. This function + * behaves the same as clearerr(). + */ +void +mio_clearerr (MIO *mio) +{ + mio->v_clearerr (mio); +} + +/** + * mio_eof: + * @mio: A #MIO object + * + * Checks whether the end-of-stream indicator of a #MIO stream is set. This + * function behaves the same as feof(). + * + * Returns: A non-null value if the stream reached its end, 0 otherwise. + */ +gint +mio_eof (MIO *mio) +{ + return mio->v_eof (mio); +} + +/** + * mio_error: + * @mio: A #MIO object + * + * Checks whether the error indicator of a #MIO stream is set. This function + * behaves the same as ferror(). + * + * Returns: A non-null value if the stream have an error set, 0 otherwise. + */ +gint +mio_error (MIO *mio) +{ + return mio->v_error (mio); +} + +/** + * mio_seek: + * @mio: A #MIO object + * @offset: Offset of the new place, from @whence + * @whence: Move origin. SEEK_SET moves relative to the start of the stream, + * SEEK_CUR from the current position and SEEK_SET from the end of the + * stream. + * + * Sets the curosr position on a #MIO stream. This functions behaves the same as + * fseek(). See also mio_tell() and mio_setpos(). + * + * Returns: 0 on success, -1 otherwise, in which case errno should be set to + * indicate the error. + */ +gint +mio_seek (MIO *mio, + glong offset, + gint whence) +{ + return mio->v_seek (mio, offset, whence); +} + +/** + * mio_tell: + * @mio: A #MIO object + * + * Gets the current cursor position of a #MIO stream. This function behaves the + * same as ftell(). + * + * Returns: The current offset from the start of the stream, or -1 or error, in + * which case errno is set to indicate the error. + */ +glong +mio_tell (MIO *mio) +{ + return mio->v_tell (mio); +} + +/** + * mio_rewind: + * @mio: A #MIO object + * + * Resets the cursor position to 0, and also the end-of-stream and the error + * indicators of a #MIO stream. + * See also mio_seek() and mio_clearerr(). + */ +void +mio_rewind (MIO *mio) +{ + mio->v_rewind (mio); +} + +/** + * mio_getpos: + * @mio: A #MIO stream + * @pos: (out): A #MIOPos object to fill-in + * + * Stores the current position (and maybe other informations about the stream + * state) of a #MIO stream in order to restore it later with mio_setpos(). This + * function behaves the same as fgetpos(). + * + * Returns: 0 on success, -1 otherwise, in which case errno is set to indicate + * the error. + */ +gint +mio_getpos (MIO *mio, + MIOPos *pos) +{ + gint rv = -1; + + pos->type = mio->type; + rv = mio->v_getpos (mio, pos); + #ifdef MIO_DEBUG + if (rv != -1) { + pos->tag = mio; + } + #endif /* MIO_DEBUG */ + + return rv; +} + +/** + * mio_setpos: + * @mio: A #MIO object + * @pos: (in): A #MIOPos object filled-in by a previous call of mio_getpos() on + * the same stream + * + * Restores the position and state indicators of a #MIO stream previously saved + * by mio_getpos(). + * + * <warning><para>The #MIOPos object must have been initialized by a previous + * call to mio_getpos() on the same stream.</para></warning> + * + * Returns: 0 on success, -1 otherwise, in which case errno is set to indicate + * the error. + */ +gint +mio_setpos (MIO *mio, + MIOPos *pos) +{ + gint rv = -1; + + #ifdef MIO_DEBUG + if (pos->tag != mio) { + g_critical ("mio_setpos((MIO*)%p, (MIOPos*)%p): " + "Given MIOPos was not set by a previous call to mio_getpos() " + "on the same MIO object, which means there is a bug in " + "someone's code.", + (void *)mio, (void *)pos); + errno = EINVAL; + return -1; + } + #endif /* MIO_DEBUG */ + rv = mio->v_setpos (mio, pos); + + return rv; +}

Property changes on: trunk/tagmanager/mio/mio.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

Added: trunk/tagmanager/mio/mio.h =================================================================== --- trunk/tagmanager/mio/mio.h (rev 0) +++ trunk/tagmanager/mio/mio.h 2011-03-05 22:40:50 UTC (rev 5555) @@ -0,0 +1,221 @@ +/* + * MIO, an I/O abstraction layer replicating C file I/O API. + * Copyright (C) 2010 Colomban Wendling ban@herbesfolles.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#ifndef H_MIO_H +#define H_MIO_H + +#include <glib.h> +#include <stdio.h> +#include <stdarg.h> + + +/** + * MIOType: + * @MIO_TYPE_FILE: #MIO object works on a file + * @MIO_TYPE_MEMORY: #MIO object works in-memory + * + * Existing implementations. + */ +enum _MIOType { + MIO_TYPE_FILE, + MIO_TYPE_MEMORY +}; + +typedef enum _MIOType MIOType; +typedef struct _MIO MIO; +typedef struct _MIOPos MIOPos; +/** + * MIOReallocFunc: + * @ptr: Pointer to the memory to resize + * @size: New size of the memory pointed by @ptr + * + * A function following the realloc() semantic. + * + * Returns: A pointer to the start of the new memory, or %NULL on failure. + */ +/* should be GReallocFunc but it's only defined by GIO */ +typedef gpointer (* MIOReallocFunc) (gpointer ptr, + gsize size); + +/** + * MIOFOpenFunc: + * @filename: The filename to open + * @mode: fopen() modes for opening @filename + * + * A function following the fclose() semantic, used to close a #FILE + * object. + * + * Returns: A new #FILE object, or %NULL on failure + */ +typedef FILE *(* MIOFOpenFunc) (const gchar *filename, + const gchar *mode); + +/** + * MIOFCloseFunc: + * @fp: An opened #FILE object + * + * A function following the fclose() semantic, used to close a #FILE + * object. + * + * Returns: 0 on success, EOF otherwise. + */ +typedef gint (* MIOFCloseFunc) (FILE *fp); + +/** + * MIOPos: + * + * An object representing the state of a #MIO stream. This object can be + * statically allocated but all its fields are private and should not be + * accessed directly. + */ +struct _MIOPos { + /*< private >*/ + guint type; +#ifdef MIO_DEBUG + void *tag; +#endif + union { + fpos_t file; + size_t mem; + } impl; +}; + +/** + * MIO: + * + * An object representing a #MIO stream. No assumptions should be made about + * what compose this object, and none of its fields should be accessed directly. + */ +struct _MIO { + /*< private >*/ + guint type; + union { + struct { + FILE *fp; + MIOFCloseFunc close_func; + } file; + struct { + guchar *buf; + gint ungetch; + gsize pos; + gsize size; + gsize allocated_size; + MIOReallocFunc realloc_func; + GDestroyNotify free_func; + gboolean error; + gboolean eof; + } mem; + } impl; + /* virtual function table */ + void (*v_free) (MIO *mio); + gsize (*v_read) (MIO *mio, + void *ptr, + gsize size, + gsize nmemb); + gsize (*v_write) (MIO *mio, + const void *ptr, + gsize size, + gsize nmemb); + gint (*v_getc) (MIO *mio); + gchar *(*v_gets) (MIO *mio, + gchar *s, + gsize size); + gint (*v_ungetc) (MIO *mio, + gint ch); + gint (*v_putc) (MIO *mio, + gint c); + gint (*v_puts) (MIO *mio, + const gchar *s); + gint (*v_vprintf) (MIO *mio, + const gchar *format, + va_list ap); + void (*v_clearerr) (MIO *mio); + gint (*v_eof) (MIO *mio); + gint (*v_error) (MIO *mio); + gint (*v_seek) (MIO *mio, + glong offset, + gint whence); + glong (*v_tell) (MIO *mio); + void (*v_rewind) (MIO *mio); + gint (*v_getpos) (MIO *mio, + MIOPos *pos); + gint (*v_setpos) (MIO *mio, + MIOPos *pos); +}; + + +MIO *mio_new_file (const gchar *filename, + const gchar *mode); +MIO *mio_new_file_full (const gchar *filename, + const gchar *mode, + MIOFOpenFunc open_func,

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.