aboutsummaryrefslogtreecommitdiffstats
path: root/libical/src/libicalvcal
diff options
context:
space:
mode:
Diffstat (limited to 'libical/src/libicalvcal')
-rw-r--r--libical/src/libicalvcal/Makefile.am38
-rw-r--r--libical/src/libicalvcal/vcc.c116
-rw-r--r--libical/src/libicalvcal/vcc.y42
3 files changed, 62 insertions, 134 deletions
diff --git a/libical/src/libicalvcal/Makefile.am b/libical/src/libicalvcal/Makefile.am
index 862d77bcea..a4e9bba887 100644
--- a/libical/src/libicalvcal/Makefile.am
+++ b/libical/src/libicalvcal/Makefile.am
@@ -1,17 +1,29 @@
+lib_LTLIBRARIES = libicalvcal.la
-lib_LIBRARIES = libicalvcal.a
+INCLUDES = \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/src/libical \
+ -I$(top_srcdir)/src/libicalss \
+ -I$(srcdir)
-libicalvcal_a_SOURCES = \
- vcc.y \
- vcc.h \
- vobject.c \
- vobject.h \
- port.h \
- vcaltmp.c \
- vcaltmp.h \
- icalvcal.c \
- icalvcal.h
+libicalvcal_la_LDFLAGS = -version-info 0:0:0
-EXTRA_DIST = README.TXT vcaltest.c vctest.c
+libicalvcal_la_SOURCES = \
+ icalvcal.c \
+ vcc.y \
+ vobject.c \
+ vcaltmp.c
-INCLUDES = -I ../libical -I $(srcdir)/../libical \ No newline at end of file
+libicalvcalincludedir = $(includedir)/libicalvcal
+
+libicalvcalinclude_HEADERS = \
+ icalvcal.h \
+ port.h \
+ vcc.h \
+ vobject.h \
+ vcaltmp.h
+
+EXTRA_DIST = \
+ README.TXT \
+ vcaltest.c \
+ vctest.c
diff --git a/libical/src/libicalvcal/vcc.c b/libical/src/libicalvcal/vcc.c
index cb57b6ed58..5c34395b83 100644
--- a/libical/src/libicalvcal/vcc.c
+++ b/libical/src/libicalvcal/vcc.c
@@ -187,7 +187,6 @@ enum LexMode {
/**** Private Forward Declarations ****/
static int pushVObject(const char *prop);
static VObject* popVObject();
-static char* lexDataFromBase64();
static void lexPopMode(int top);
static int lexWithinMode(enum LexMode mode);
static void lexPushMode(enum LexMode mode);
@@ -197,7 +196,7 @@ static void enterValues(const char *value);
static void mime_error_(char *s);
-#line 179 "vcc.y"
+#line 178 "vcc.y"
typedef union {
char *str;
VObject *vobj;
@@ -277,11 +276,11 @@ static const short yyrhs[] = { 22,
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 207, 210, 213, 213, 217, 218, 221, 227, 232, 238,
- 244, 245, 248, 252, 258, 261, 266, 266, 272, 273,
- 276, 279, 283, 290, 293, 294, 294, 298, 299, 302,
- 306, 308, 311, 314, 315, 318, 320, 321, 324, 331,
- 336, 342, 348, 355, 360, 366
+ 206, 209, 212, 212, 216, 217, 220, 226, 231, 237,
+ 243, 244, 247, 251, 257, 260, 265, 265, 271, 272,
+ 275, 278, 282, 289, 292, 293, 293, 297, 298, 301,
+ 305, 307, 310, 313, 314, 317, 319, 320, 323, 330,
+ 335, 341, 347, 354, 359, 365
};
#endif
@@ -368,7 +367,7 @@ static const short yycheck[] = { 7,
41, 11, 57, 23
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/pkg/share/bison.simple"
+#line 3 "/usr/lib/bison.simple"
/* This file comes from bison-1.28. */
/* Skeleton output parser for bison,
@@ -582,7 +581,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
#endif
#endif
-#line 217 "/usr/pkg/share/bison.simple"
+#line 217 "/usr/lib/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
@@ -911,49 +910,49 @@ yyreduce:
switch (yyn) {
case 2:
-#line 211 "vcc.y"
+#line 210 "vcc.y"
{ addList(&vObjList, yyvsp[0].vobj); curObj = 0; ;
break;}
case 4:
-#line 214 "vcc.y"
+#line 213 "vcc.y"
{ addList(&vObjList, yyvsp[0].vobj); curObj = 0; ;
break;}
case 7:
-#line 223 "vcc.y"
+#line 222 "vcc.y"
{
lexPushMode(L_VCARD);
if (!pushVObject(VCCardProp)) YYERROR;
;
break;}
case 8:
-#line 228 "vcc.y"
+#line 227 "vcc.y"
{
lexPopMode(0);
yyval.vobj = popVObject();
;
break;}
case 9:
-#line 233 "vcc.y"
+#line 232 "vcc.y"
{
lexPushMode(L_VCARD);
if (!pushVObject(VCCardProp)) YYERROR;
;
break;}
case 10:
-#line 238 "vcc.y"
+#line 237 "vcc.y"
{
lexPopMode(0);
yyval.vobj = popVObject();
;
break;}
case 13:
-#line 249 "vcc.y"
+#line 248 "vcc.y"
{
lexPushMode(L_VALUES);
;
break;}
case 14:
-#line 253 "vcc.y"
+#line 252 "vcc.y"
{
if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE))
lexPopMode(0);
@@ -961,109 +960,109 @@ case 14:
;
break;}
case 16:
-#line 262 "vcc.y"
+#line 261 "vcc.y"
{
enterProps(yyvsp[0].str);
;
break;}
case 18:
-#line 267 "vcc.y"
+#line 266 "vcc.y"
{
enterProps(yyvsp[0].str);
;
break;}
case 22:
-#line 280 "vcc.y"
+#line 279 "vcc.y"
{
enterAttr(yyvsp[0].str,0);
;
break;}
case 23:
-#line 284 "vcc.y"
+#line 283 "vcc.y"
{
enterAttr(yyvsp[-2].str,yyvsp[0].str);
;
break;}
case 25:
-#line 293 "vcc.y"
+#line 292 "vcc.y"
{ enterValues(yyvsp[-1].str); ;
break;}
case 27:
-#line 295 "vcc.y"
+#line 294 "vcc.y"
{ enterValues(yyvsp[0].str); ;
break;}
case 29:
-#line 299 "vcc.y"
+#line 298 "vcc.y"
{ yyval.str = 0; ;
break;}
case 30:
-#line 304 "vcc.y"
+#line 303 "vcc.y"
{ if (!pushVObject(VCCalProp)) YYERROR; ;
break;}
case 31:
-#line 307 "vcc.y"
+#line 306 "vcc.y"
{ yyval.vobj = popVObject(); ;
break;}
case 32:
-#line 309 "vcc.y"
+#line 308 "vcc.y"
{ if (!pushVObject(VCCalProp)) YYERROR; ;
break;}
case 33:
-#line 311 "vcc.y"
+#line 310 "vcc.y"
{ yyval.vobj = popVObject(); ;
break;}
case 39:
-#line 326 "vcc.y"
+#line 325 "vcc.y"
{
lexPushMode(L_VEVENT);
if (!pushVObject(VCEventProp)) YYERROR;
;
break;}
case 40:
-#line 332 "vcc.y"
+#line 331 "vcc.y"
{
lexPopMode(0);
popVObject();
;
break;}
case 41:
-#line 337 "vcc.y"
+#line 336 "vcc.y"
{
lexPushMode(L_VEVENT);
if (!pushVObject(VCEventProp)) YYERROR;
;
break;}
case 42:
-#line 342 "vcc.y"
+#line 341 "vcc.y"
{
lexPopMode(0);
popVObject();
;
break;}
case 43:
-#line 350 "vcc.y"
+#line 349 "vcc.y"
{
lexPushMode(L_VTODO);
if (!pushVObject(VCTodoProp)) YYERROR;
;
break;}
case 44:
-#line 356 "vcc.y"
+#line 355 "vcc.y"
{
lexPopMode(0);
popVObject();
;
break;}
case 45:
-#line 361 "vcc.y"
+#line 360 "vcc.y"
{
lexPushMode(L_VTODO);
if (!pushVObject(VCTodoProp)) YYERROR;
;
break;}
case 46:
-#line 366 "vcc.y"
+#line 365 "vcc.y"
{
lexPopMode(0);
popVObject();
@@ -1071,7 +1070,7 @@ case 46:
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/pkg/share/bison.simple"
+#line 543 "/usr/lib/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;
@@ -1291,9 +1290,8 @@ yyerrhandle:
}
return 1;
}
-#line 372 "vcc.y"
+#line 371 "vcc.y"
-/*/////////////////////////////////////////////////////////////////////////*/
static int pushVObject(const char *prop)
{
VObject *newObj;
@@ -1313,7 +1311,6 @@ static int pushVObject(const char *prop)
}
-/*/////////////////////////////////////////////////////////////////////////*/
/* This pops the recently built vCard off the stack and returns it. */
static VObject* popVObject()
{
@@ -1554,22 +1551,6 @@ static char* lexGetWord() {
return lexStr();
}
-static void lexPushLookahead(char *s, int len) {
- int putptr;
- if (len == 0) len = strlen(s);
- putptr = (int)lexBuf.getPtr - len;
- /* this function assumes that length of word to push back
- / is not greater than MAX_LEX_LOOKAHEAD.
- */
- if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;
- lexBuf.getPtr = putptr;
- while (*s) {
- lexBuf.buf[putptr] = *s++;
- putptr = (putptr + 1) % MAX_LEX_LOOKAHEAD;
- }
- lexBuf.len += len;
- }
-
static void lexPushLookaheadc(int c) {
int putptr;
/* can't putback EOF, because it never leaves lookahead buffer */
@@ -1648,7 +1629,6 @@ static void handleMoreRFC822LineBreak(int c) {
}
static char* lexGet1Value() {
- int size = 0;
int c;
lexSkipWhite();
c = lexLookahead();
@@ -1679,18 +1659,6 @@ static char* lexGet1Value() {
}
#endif
-static char* lexGetStrUntil(char *termset) {
- int size = 0;
- int c = lexLookahead();
- lexClearToken();
- while (c != EOF && !strchr(termset,c)) {
- lexAppendc(c);
- lexSkipLookahead();
- c = lexLookahead();
- }
- lexAppendc(0);
- return c==EOF?0:lexStr();
- }
static int match_begin_name(int end) {
char *n = lexLookaheadWord();
@@ -1736,7 +1704,6 @@ static void finiLex() {
}
-/*/////////////////////////////////////////////////////////////////////////*/
/* This parses and converts the base64 format for binary encoding into
* a decoded buffer (allocated with new). See RFC 1521.
*/
@@ -1865,7 +1832,6 @@ static int match_begin_end_name(int end) {
static char* lexGetQuotedPrintable()
{
char cur;
- unsigned long len = 0;
lexClearToken();
do {
@@ -1921,7 +1887,6 @@ EndString:
} /* LexQuotedPrintable */
int yylex() {
- int token = 0;
int lexmode = LEXMODE();
if (lexmode == L_VALUES) {
@@ -2054,7 +2019,6 @@ static VObject* Parse_MIMEHelper()
return vObjList;
}
-/*/////////////////////////////////////////////////////////////////////////*/
DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len)
{
initLex(input, len, 0);
@@ -2109,12 +2073,6 @@ DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
#endif
-/*/////////////////////////////////////////////////////////////////////////*/
-static void YYDebug(const char *s)
-{
-/* Parse_Debug(s); */
-}
-
static MimeErrorHandler mimeErrorHandler;
diff --git a/libical/src/libicalvcal/vcc.y b/libical/src/libicalvcal/vcc.y
index 1c800990c4..70feefab57 100644
--- a/libical/src/libicalvcal/vcc.y
+++ b/libical/src/libicalvcal/vcc.y
@@ -161,7 +161,6 @@ enum LexMode {
/**** Private Forward Declarations ****/
static int pushVObject(const char *prop);
static VObject* popVObject();
-static char* lexDataFromBase64();
static void lexPopMode(int top);
static int lexWithinMode(enum LexMode mode);
static void lexPushMode(enum LexMode mode);
@@ -370,7 +369,6 @@ todoitem:
;
%%
-/*/////////////////////////////////////////////////////////////////////////*/
static int pushVObject(const char *prop)
{
VObject *newObj;
@@ -390,7 +388,6 @@ static int pushVObject(const char *prop)
}
-/*/////////////////////////////////////////////////////////////////////////*/
/* This pops the recently built vCard off the stack and returns it. */
static VObject* popVObject()
{
@@ -631,22 +628,6 @@ static char* lexGetWord() {
return lexStr();
}
-static void lexPushLookahead(char *s, int len) {
- int putptr;
- if (len == 0) len = strlen(s);
- putptr = (int)lexBuf.getPtr - len;
- /* this function assumes that length of word to push back
- / is not greater than MAX_LEX_LOOKAHEAD.
- */
- if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;
- lexBuf.getPtr = putptr;
- while (*s) {
- lexBuf.buf[putptr] = *s++;
- putptr = (putptr + 1) % MAX_LEX_LOOKAHEAD;
- }
- lexBuf.len += len;
- }
-
static void lexPushLookaheadc(int c) {
int putptr;
/* can't putback EOF, because it never leaves lookahead buffer */
@@ -725,7 +706,6 @@ static void handleMoreRFC822LineBreak(int c) {
}
static char* lexGet1Value() {
- int size = 0;
int c;
lexSkipWhite();
c = lexLookahead();
@@ -756,18 +736,6 @@ static char* lexGet1Value() {
}
#endif
-static char* lexGetStrUntil(char *termset) {
- int size = 0;
- int c = lexLookahead();
- lexClearToken();
- while (c != EOF && !strchr(termset,c)) {
- lexAppendc(c);
- lexSkipLookahead();
- c = lexLookahead();
- }
- lexAppendc(0);
- return c==EOF?0:lexStr();
- }
static int match_begin_name(int end) {
char *n = lexLookaheadWord();
@@ -813,7 +781,6 @@ static void finiLex() {
}
-/*/////////////////////////////////////////////////////////////////////////*/
/* This parses and converts the base64 format for binary encoding into
* a decoded buffer (allocated with new). See RFC 1521.
*/
@@ -942,7 +909,6 @@ static int match_begin_end_name(int end) {
static char* lexGetQuotedPrintable()
{
char cur;
- unsigned long len = 0;
lexClearToken();
do {
@@ -998,7 +964,6 @@ EndString:
} /* LexQuotedPrintable */
int yylex() {
- int token = 0;
int lexmode = LEXMODE();
if (lexmode == L_VALUES) {
@@ -1131,7 +1096,6 @@ static VObject* Parse_MIMEHelper()
return vObjList;
}
-/*/////////////////////////////////////////////////////////////////////////*/
DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len)
{
initLex(input, len, 0);
@@ -1186,12 +1150,6 @@ DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
#endif
-/*/////////////////////////////////////////////////////////////////////////*/
-static void YYDebug(const char *s)
-{
-/* Parse_Debug(s); */
-}
-
static MimeErrorHandler mimeErrorHandler;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 02:46:13 +0800