[w3m-dev 02656]

From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2001-12-14 17:10:54 +00:00
parent 776c1fa566
commit 68d47de87a
4 changed files with 20 additions and 17 deletions

View File

@@ -1,3 +1,10 @@
2001-12-15 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
* [w3m-dev 02656]
* XMakefile (clean): remove functable.c
* anchor.c (_put_anchor_new): use Strnew_size() and Strcat_charp_n()
* indep.c (getescapechar): use GET_MYCDIGIT
2001-12-13 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
* [w3m-dev 02541] mouse support on cygwin
@@ -1225,4 +1232,4 @@
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.125 2001/12/12 17:04:20 ukai Exp $
$Id: ChangeLog,v 1.126 2001/12/14 17:10:54 ukai Exp $

View File

@@ -1,4 +1,4 @@
# $Id: XMakefile,v 1.16 2001/12/10 17:02:44 ukai Exp $
# $Id: XMakefile,v 1.17 2001/12/14 17:10:54 ukai Exp $
SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
form.c map.c frame.c rc.c menu.c mailcap.c\
func.c cookie.c history.c backend.c $(KEYBIND_SRC)
@@ -142,7 +142,7 @@ uninstall:
clean: sweep
-rm -f *.o *.a $(TARGETS) mktable$(EXT)
-rm -f funcname.c funcname1.h funcname2.h tagtable.c
-rm -f funcname.c funcname1.h funcname2.h tagtable.c functable.c
-for dir in $(SCRIPTSUBDIRS); \
do \
(cd $$dir; $(MAKE) clean); \

View File

@@ -1,4 +1,4 @@
/* $Id: anchor.c,v 1.6 2001/11/24 02:01:26 ukai Exp $ */
/* $Id: anchor.c,v 1.7 2001/12/14 17:10:54 ukai Exp $ */
#include "fm.h"
#include "myctype.h"
#include "regex.h"
@@ -185,14 +185,14 @@ searchURLLabel(Buffer *buf, char *url)
static Anchor *
_put_anchor_news(Buffer *buf, char *p1, char *p2, int line, int pos)
{
Str tmp = Strnew_charp("news:");
Str tmp;
p1++;
if (*(p2 - 1) == '>')
p2--;
while (p1 < p2) {
Strcat_char(tmp, *(p1++));
}
tmp = Strnew_size(sizeof("news:") - 1 + (p2 - p1));
Strcat_charp_n(tmp, "news:", sizeof("news:") - 1);
Strcat_charp_n(tmp, p1, p2 - p1);
return registerHref(buf, tmp->ptr, NULL, NO_REFERER, line, pos);
}
#endif /* USE_NNTP */

14
indep.c
View File

@@ -1,4 +1,4 @@
/* $Id: indep.c,v 1.17 2001/12/10 17:02:44 ukai Exp $ */
/* $Id: indep.c,v 1.18 2001/12/14 17:10:54 ukai Exp $ */
#include "fm.h"
#include <stdio.h>
#include <pwd.h>
@@ -286,13 +286,11 @@ getescapechar(char **str)
*str = p;
return -1;
}
q = p;
for (p++; IS_XDIGIT(*p); p++) ;
q = allocStr(q, p - q);
for (dummy = GET_MYCDIGIT(*p), p++; IS_XDIGIT(*p); p++)
dummy = dummy * 0x10 + GET_MYCDIGIT(*p);
if (*p == ';')
p++;
*str = p;
sscanf(q, "%x", &dummy);
return dummy;
}
else {
@@ -300,13 +298,11 @@ getescapechar(char **str)
*str = p;
return -1;
}
q = p;
for (p++; IS_DIGIT(*p); p++) ;
q = allocStr(q, p - q);
for (dummy = GET_MYCDIGIT(*p), p++; IS_DIGIT(*p); p++)
dummy = dummy * 10 + GET_MYCDIGIT(*p);
if (*p == ';')
p++;
*str = p;
sscanf(q, "%d", &dummy);
return dummy;
}
}