update to 2.1pre16 and remove my shift fix since it causes troubles in
other areas. reported by Ray <ray at cyth dot net> and Alex Holst <a at mongers dot org>. tested by jolan@ and pedro@
This commit is contained in:
fgsch
parent
1e202bb29e
commit
66f82ad931
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.18 2004/12/11 13:29:21 alek Exp $
|
||||
# $OpenBSD: Makefile,v 1.19 2005/02/24 22:24:55 fgsch Exp $
|
||||
|
||||
COMMENT= "graphics and text browser with javascript support"
|
||||
|
||||
VER= 2.1pre15
|
||||
VER= 2.1pre16
|
||||
DISTNAME= links-${VER}
|
||||
PKGNAME= links+-${VER}
|
||||
CATEGORIES= www
|
||||
@ -22,6 +22,7 @@ WANTLIB= c crypto m ssl
|
||||
FLAVORS= no_x11
|
||||
FLAVOR?=
|
||||
|
||||
AUTOCONF_VERSION= 2.13
|
||||
CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_ARGS+= --enable-javascript --with-ssl
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (links-2.1pre15.tar.gz) = eb4ed4c63d15f27e3732240ea73c7f17
|
||||
RMD160 (links-2.1pre15.tar.gz) = a33514c16eeaae6aa789b688c9d6888f26fe61c5
|
||||
SHA1 (links-2.1pre15.tar.gz) = 66ff1000b0655346c8fcfac4e4ecc702083c56ff
|
||||
SIZE (links-2.1pre15.tar.gz) = 4111073
|
||||
MD5 (links-2.1pre16.tar.gz) = 7baf4fc20cc244d80ead21cebff07d89
|
||||
RMD160 (links-2.1pre16.tar.gz) = 45461878e5a1024ee497cf02f81218be47899391
|
||||
SHA1 (links-2.1pre16.tar.gz) = 3306d79deb6d852c0eea8fc978f78c2022a63935
|
||||
SIZE (links-2.1pre16.tar.gz) = 4217483
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-config_h_in,v 1.2 2004/12/04 01:01:42 fgsch Exp $
|
||||
--- config.h.in.orig Wed Apr 28 12:19:23 2004
|
||||
+++ config.h.in Fri Dec 3 21:51:38 2004
|
||||
$OpenBSD: patch-config_h_in,v 1.3 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- config.h.in.orig Sat Jan 22 17:54:24 2005
|
||||
+++ config.h.in Mon Feb 21 13:46:14 2005
|
||||
@@ -65,6 +65,12 @@
|
||||
/* The number of bytes in a unsigned short. */
|
||||
#undef SIZEOF_UNSIGNED_SHORT
|
||||
@ -11,6 +11,16 @@ $OpenBSD: patch-config_h_in,v 1.2 2004/12/04 01:01:42 fgsch Exp $
|
||||
+/* Define if you have the MD5Init function. */
|
||||
+#undef HAVE_MD5INIT
|
||||
+
|
||||
/* Define if you have the alarm function. */
|
||||
#undef HAVE_ALARM
|
||||
/* Define if you have the calloc function. */
|
||||
#undef HAVE_CALLOC
|
||||
|
||||
@@ -181,6 +187,9 @@
|
||||
|
||||
/* Define if you have the <ieee.h> header file. */
|
||||
#undef HAVE_IEEE_H
|
||||
+
|
||||
+/* Define if you have the <inttypes.h> header file. */
|
||||
+#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define if you have the <io.h> header file. */
|
||||
#undef HAVE_IO_H
|
||||
|
||||
@ -1,7 +1,28 @@
|
||||
$OpenBSD: patch-configure_in,v 1.2 2003/04/07 19:30:21 fgsch Exp $
|
||||
--- configure.in.orig Wed Feb 26 15:43:43 2003
|
||||
+++ configure.in Fri Apr 4 00:16:18 2003
|
||||
@@ -131,6 +131,7 @@ AC_HAVE_FUNCS(uname)
|
||||
$OpenBSD: patch-configure_in,v 1.3 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- configure.in.orig Sat Jan 22 17:51:53 2005
|
||||
+++ configure.in Mon Feb 21 13:46:43 2005
|
||||
@@ -5,11 +5,7 @@
|
||||
|
||||
AC_INIT(main.c)
|
||||
|
||||
-<<<<<<< configure.in
|
||||
-AM_INIT_AUTOMAKE(links, 2.1pre15)
|
||||
-=======
|
||||
AM_INIT_AUTOMAKE(links, 2.1pre16)
|
||||
->>>>>>> 1.111
|
||||
|
||||
ACLOCAL="./missing aclocal"
|
||||
AUTOCONF="./missing autoconf"
|
||||
@@ -69,6 +65,8 @@ AC_CHECK_HEADERS(sys/cygwin.h)
|
||||
AC_CHECK_HEADERS(io.h)
|
||||
AC_CHECK_HEADERS(setjmp.h)
|
||||
AC_CHECK_HEADERS(langinfo.h)
|
||||
+AC_CHECK_HEADERS(langinfo.h)
|
||||
+AC_CHECK_HEADERS(inttypes.h)
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_C_CONST
|
||||
@@ -140,6 +138,7 @@ AC_HAVE_FUNCS(getpagesize)
|
||||
AC_HAVE_FUNCS(strptime)
|
||||
AC_HAVE_FUNCS(setlocale)
|
||||
AC_HAVE_FUNCS(nl_langinfo)
|
||||
@ -9,3 +30,12 @@ $OpenBSD: patch-configure_in,v 1.2 2003/04/07 19:30:21 fgsch Exp $
|
||||
dnl AC_HAVE_FUNCS(sigsetjmp siglongjmp)
|
||||
|
||||
AC_CACHE_CHECK([for sigsetjmp/siglongjmp], ac_cv_have_sigsetjmp,
|
||||
@@ -282,7 +281,7 @@ CPPFLAGS_X="$CPPFLAGS"
|
||||
LIBS_X="$LIBS"
|
||||
cf_result=no
|
||||
if test -z "$disable_ssl"; then
|
||||
- PKG_CHECK_MODULES(OPENSSL,openssl,pkgconfig_openssl=yes,pkgconfig_openssl=no)
|
||||
+# PKG_CHECK_MODULES(OPENSSL,openssl,pkgconfig_openssl=yes,pkgconfig_openssl=no)
|
||||
if test "$pkgconfig_openssl" = "yes"; then
|
||||
AC_MSG_CHECKING([for OpenSSL])
|
||||
CPPFLAGS="$CPPFLAGS `pkg-config openssl --cflags-only-I`"
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-cookies_c,v 1.2 2003/06/12 13:47:44 brad Exp $
|
||||
--- cookies.c.orig Tue May 20 13:31:14 2003
|
||||
+++ cookies.c Wed Jun 4 08:57:14 2003
|
||||
@@ -178,7 +178,7 @@ void delete_cookie(struct cookie *c)
|
||||
$OpenBSD: patch-cookies_c,v 1.3 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- cookies.c.orig Sun Jan 2 17:17:25 2005
|
||||
+++ cookies.c Mon Feb 21 12:05:43 2005
|
||||
@@ -188,7 +188,7 @@ void delete_cookie(struct cookie *c)
|
||||
|
||||
struct cookie *find_cookie_id(void *idp)
|
||||
{
|
||||
- int id = (int)idp;
|
||||
+ int id = (intptr_t)idp;
|
||||
- long id = (long)idp;
|
||||
+ long id = (intptr_t)idp;
|
||||
struct cookie *c;
|
||||
foreach(c, cookies) if (c->id == id) return c;
|
||||
return NULL;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-html_c,v 1.7 2004/12/04 01:01:42 fgsch Exp $
|
||||
--- html.c.orig Tue Apr 20 05:08:40 2004
|
||||
+++ html.c Fri Dec 3 20:35:31 2004
|
||||
@@ -799,6 +799,7 @@ void html_a(unsigned char *a)
|
||||
$OpenBSD: patch-html_c,v 1.8 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- html.c.orig Sat Jan 22 17:51:53 2005
|
||||
+++ html.c Mon Feb 21 12:06:25 2005
|
||||
@@ -882,6 +882,7 @@ void html_a(unsigned char *a)
|
||||
format.target = stracpy(format.target_base);
|
||||
}
|
||||
/*format.attr ^= AT_BOLD;*/
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-html_c,v 1.7 2004/12/04 01:01:42 fgsch Exp $
|
||||
memcpy(&format.fg, &format.clink, sizeof(struct rgb));
|
||||
} else if (!ev) kill_html_stack_item(&html_top);
|
||||
if ((al = get_attr_val(a, "name"))) {
|
||||
@@ -1681,7 +1682,7 @@ void new_menu_item(unsigned char *name,
|
||||
@@ -1767,7 +1768,7 @@ void new_menu_item(unsigned char *name,
|
||||
item->rtext = data == -1 ? ">" : "";
|
||||
item->hotkey = fullname ? "\000\001" : "\000\000"; /* dirty */
|
||||
item->func = data == -1 ? MENU_FUNC do_select_submenu : MENU_FUNC selected_item;
|
||||
@ -18,11 +18,11 @@ $OpenBSD: patch-html_c,v 1.7 2004/12/04 01:01:42 fgsch Exp $
|
||||
item->in_m = data == -1 ? 1 : 0;
|
||||
item->free_i = 0;
|
||||
item++;
|
||||
@@ -1741,14 +1742,14 @@ void menu_labels(struct menu_item *m, un
|
||||
@@ -1826,14 +1827,14 @@ void menu_labels(struct menu_item *m, un
|
||||
}
|
||||
} else {
|
||||
if ((bs = stracpy(m->hotkey[1] ? (unsigned char *)"" : base))) add_to_strn(&bs, m->text);
|
||||
- lbls[(int)m->data] = bs;
|
||||
- lbls[(long)m->data] = bs;
|
||||
+ lbls[(intptr_t)m->data] = bs;
|
||||
}
|
||||
}
|
||||
@ -30,7 +30,7 @@ $OpenBSD: patch-html_c,v 1.7 2004/12/04 01:01:42 fgsch Exp $
|
||||
|
||||
int menu_contains(struct menu_item *m, int f)
|
||||
{
|
||||
- if (m->func != MENU_FUNC do_select_submenu) return (int)m->data == f;
|
||||
- if (m->func != MENU_FUNC do_select_submenu) return (long)m->data == f;
|
||||
+ if (m->func != MENU_FUNC do_select_submenu) return (intptr_t)m->data == f;
|
||||
for (m = m->data; m->text; m++) if (menu_contains(m, f)) return 1;
|
||||
return 0;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-html_gr_c,v 1.3 2003/06/12 13:47:44 brad Exp $
|
||||
--- html_gr.c.orig Thu May 22 03:29:13 2003
|
||||
+++ html_gr.c Wed Jun 4 08:57:14 2003
|
||||
@@ -615,7 +615,7 @@ void *g_html_special(struct g_part *p, i
|
||||
$OpenBSD: patch-html_gr_c,v 1.4 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- html_gr.c.orig Sat Jan 22 17:51:53 2005
|
||||
+++ html_gr.c Mon Feb 21 12:06:43 2005
|
||||
@@ -642,7 +642,7 @@ void *g_html_special(struct g_part *p, i
|
||||
return convert_table;
|
||||
case SP_USED:
|
||||
va_end(l);
|
||||
- return (void *)!!p->data;
|
||||
- return (void *)!!p->data; /* cast to pointer from integer of different size */
|
||||
+ return (void *)(intptr_t)!!p->data;
|
||||
case SP_FRAMESET:
|
||||
fsp = va_arg(l, struct frameset_param *);
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-html_r_c,v 1.4 2004/12/04 01:01:42 fgsch Exp $
|
||||
--- html_r.c.orig Tue Apr 20 05:08:41 2004
|
||||
+++ html_r.c Fri Dec 3 20:35:31 2004
|
||||
@@ -930,7 +930,7 @@ void *html_special(struct part *p, int c
|
||||
$OpenBSD: patch-html_r_c,v 1.5 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- html_r.c.orig Sat Jan 22 17:51:53 2005
|
||||
+++ html_r.c Mon Feb 21 12:06:55 2005
|
||||
@@ -944,7 +944,7 @@ void *html_special(struct part *p, int c
|
||||
case SP_TABLE:
|
||||
return convert_table;
|
||||
case SP_USED:
|
||||
- return (void *)!!p->data;
|
||||
- return (void *)!!p->data; /* cast to pointer from integer of different size */
|
||||
+ return (void *)(intptr_t)!!p->data;
|
||||
case SP_FRAMESET:
|
||||
fsp = va_arg(l, struct frameset_param *);
|
||||
|
||||
@ -1,40 +1,40 @@
|
||||
$OpenBSD: patch-ipret_c,v 1.5 2004/12/04 01:01:42 fgsch Exp $
|
||||
--- ipret.c.orig Mon Feb 2 14:25:47 2004
|
||||
+++ ipret.c Fri Dec 3 20:35:31 2004
|
||||
@@ -3351,22 +3351,22 @@ void for3(js_context*context)
|
||||
$OpenBSD: patch-ipret_c,v 1.6 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- ipret.c.orig Sun Jan 2 17:17:25 2005
|
||||
+++ ipret.c Mon Feb 21 12:26:33 2005
|
||||
@@ -3470,22 +3470,22 @@ void for3(js_context*context)
|
||||
*/
|
||||
debug("For3 vracim identifier\n");
|
||||
if(!context->current->arg[6])
|
||||
-nebo_skrtnem_sirkou: while(!context->current->arg[6] && ((int)context->current->arg[5])<HASHNUM)
|
||||
-nebo_skrtnem_sirkou: while(!context->current->arg[6] && ((long)context->current->arg[5])<HASHNUM)
|
||||
+nebo_skrtnem_sirkou: while(!context->current->arg[6] && ((intptr_t)context->current->arg[5])<HASHNUM)
|
||||
{
|
||||
- context->current->arg[6]=((plns*)((lns*)context->current->arg[3])->value)->ns[(int)context->current->arg[5]];
|
||||
- context->current->arg[6]=((plns*)((lns*)context->current->arg[3])->value)->ns[(long)context->current->arg[5]];
|
||||
+ context->current->arg[6]=((plns*)((lns*)context->current->arg[3])->value)->ns[(intptr_t)context->current->arg[5]];
|
||||
/* co tim chtel basnik rict ?? */
|
||||
/* Basnik: context->ptr->arg[3] je typu lns*, jeho value je plns* a my
|
||||
koukneme do namespacu pod timto plns (to znamena pointer na localnamespace)
|
||||
a to konkretne do context->current->arg[5]-te pozice. */
|
||||
/*(int)context->current->arg[5]=(int)context->current->arg[5]+1;*/
|
||||
- context->current->arg[5]=(void *)((int)context->current->arg[5]+1);
|
||||
- context->current->arg[5]=(void *)((long)context->current->arg[5]+1);
|
||||
+ context->current->arg[5]=(void *)((intptr_t)context->current->arg[5]+1);
|
||||
}
|
||||
else { context->current->arg[6]=((lns*)context->current->arg[6])->next;
|
||||
- while(!context->current->arg[6] && ((int)context->current->arg[5])<HASHNUM)
|
||||
- { context->current->arg[6]=((plns*)((lns*)context->current->arg[3])->value)->ns[(int)context->current->arg[5]];
|
||||
- while(!context->current->arg[6] && ((long)context->current->arg[5])<HASHNUM)
|
||||
- { context->current->arg[6]=((plns*)((lns*)context->current->arg[3])->value)->ns[(long)context->current->arg[5]];
|
||||
+ while(!context->current->arg[6] && ((intptr_t)context->current->arg[5])<HASHNUM)
|
||||
+ { context->current->arg[6]=((plns*)((lns*)context->current->arg[3])->value)->ns[(intptr_t)context->current->arg[5]];
|
||||
/* co tim chtel basnik rict ?? */
|
||||
/*(int)context->current->arg[5]=(int)context->current->arg[5]+1;*/
|
||||
- context->current->arg[5]=(void *)((int)context->current->arg[5]+1);
|
||||
- context->current->arg[5]=(void *)((long)context->current->arg[5]+1);
|
||||
+ context->current->arg[5]=(void *)((intptr_t)context->current->arg[5]+1);
|
||||
}
|
||||
}
|
||||
if(!context->current->arg[6])
|
||||
@@ -3391,7 +3391,7 @@ nebo_skrtnem_sirkou: while(!context->cu
|
||||
@@ -3510,7 +3510,7 @@ nebo_skrtnem_sirkou: while(!context->cu
|
||||
{ context->current->arg[6]=((lns*)context->current->arg[6])->next;
|
||||
goto nebo_skrtnem_sirkou;
|
||||
}
|
||||
- pna=context->namespace[((int)context->current->arg[5])-1];
|
||||
- pna=context->namespace[((long)context->current->arg[5])-1];
|
||||
+ pna=context->namespace[((intptr_t)context->current->arg[5])-1];
|
||||
while(pna && (pna->klic!=((lns*)context->current->arg[6])->identifier/HASHNUM))pna=pna->next;
|
||||
if(!pna){ my_internal("Kalim mimo misu!\n",context);
|
||||
|
||||
@ -1,21 +1,12 @@
|
||||
$OpenBSD: patch-jsint_c,v 1.6 2004/12/04 01:01:42 fgsch Exp $
|
||||
--- jsint.c.orig Wed Apr 28 09:41:34 2004
|
||||
+++ jsint.c Fri Dec 3 20:35:32 2004
|
||||
@@ -2836,7 +2836,7 @@ static void __js_upcall_goto_history_ok_
|
||||
$OpenBSD: patch-jsint_c,v 1.7 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- jsint.c.orig Sun Jan 2 17:17:26 2005
|
||||
+++ jsint.c Mon Feb 21 12:07:15 2005
|
||||
@@ -2849,7 +2849,7 @@ static void __js_upcall_goto_history_ok_
|
||||
|
||||
if (a<jsid->n&&(fd->js)&&jsid->js_id==fd->js->ctx->js_id){js_downcall_vezmi_null(fd->js->ctx);return;} /* call downcall */
|
||||
|
||||
- go_backwards(fd->ses->term,(void*)(jsid->n),fd->ses);
|
||||
- go_backwards(fd->ses->term,(void*)(jsid->n),fd->ses); /* 2848: warning: cast to pointer from integer of different size */
|
||||
+ go_backwards(fd->ses->term,(void*)(intptr_t)(jsid->n),fd->ses);
|
||||
}
|
||||
|
||||
|
||||
@@ -2944,7 +2944,7 @@ void js_upcall_goto_history(void * data)
|
||||
{
|
||||
js_mem_free(s);
|
||||
mem_free(url);
|
||||
- go_backwards(term,(void*)(history_num),fd->ses);
|
||||
+ go_backwards(term,(void*)(intptr_t)(history_num),fd->ses);
|
||||
}
|
||||
return;
|
||||
goto_history_failed:
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-language_inc,v 1.1 2004/12/04 01:22:16 fgsch Exp $
|
||||
--- language.inc.orig Fri Dec 3 22:14:22 2004
|
||||
+++ language.inc Fri Dec 3 22:15:01 2004
|
||||
@@ -6504,7 +6504,7 @@ struct translation translation_german []
|
||||
$OpenBSD: patch-language_inc,v 1.2 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- language.inc.orig Sat Jan 22 17:51:55 2005
|
||||
+++ language.inc Mon Feb 21 12:18:42 2005
|
||||
@@ -6687,7 +6687,7 @@ struct translation translation_german []
|
||||
{T_OK, "OK" },
|
||||
{T_KEYS, "Tasten" },
|
||||
{T_KEYS_DESC, "ESC Menue-Anzeige\n^C, q quit\n^P, ^N auf/ab blättern\n[, ] links/rechts blättern \nBild rauf/runter Linkauswahl\n-> Link folgen\n<- zurück\nz zurück (nur im Grafischmodus)\n^r wiederladen\n^s stopp\ng gehe zu Adresse\nG gehe zu Adresse (von aktueller URL)\n^G gehe zu Adresse (von aktueller Link)\n/ Suche\n? Suche rückwärts\nn nächster Suchbegriff\nN vorh. Suchbegriff\n= Dokument-Info\n| Kopf-Info\n\\ Dokument-Quelle\nd Speichern\n^W URL oder Suchetext komplettieren\n" },
|
||||
- {T_COPYING, "Copying" },
|
||||
+ {T_COPYING, "Lizenz" },
|
||||
{T_COPYING_DESC, "Links " VERSION_STRING "\n\n" LINKS_COPYRIGHT_8859_1 "\n\nDieses Programm ist freie Software; es kann unter den Bedingungen der GNU General Public License - wie von der Free Software Foundation veröffentlicht - verändert/weiter verbreitet werden; entweder Version 2 der GPL, oder (wenn Sie möchten) jede neuere Version." },
|
||||
{T_COPYING_DESC, "Links " VERSION_STRING "\n\n" LINKS_COPYRIGHT_8859_1 "\n\nDieses Programm ist freie Software; es kann unter den Bedingungen der GNU General Public License - wie von der Free Software Foundation veröffentlicht - verändert/weiter verbreitet werden; entweder Version 2 der GPL, oder (wenn Sie möchten) jede neuere Version" },
|
||||
{T_RESOURCES, "Resourcen" },
|
||||
{T_HANDLES, "offene Dateien" },
|
||||
|
||||
@ -1,11 +1,15 @@
|
||||
$OpenBSD: patch-links_h,v 1.9 2003/11/17 22:59:32 fgsch Exp $
|
||||
--- links.h.orig 2003-09-18 08:46:34.000000000 -0300
|
||||
+++ links.h 2003-09-23 02:55:15.000000000 -0300
|
||||
@@ -137,6 +137,8 @@ x #endif*/
|
||||
$OpenBSD: patch-links_h,v 1.10 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- links.h.orig Sat Jan 22 17:51:55 2005
|
||||
+++ links.h Mon Feb 21 12:03:39 2005
|
||||
@@ -140,6 +140,12 @@ x #endif*/
|
||||
#define longlong long
|
||||
#endif
|
||||
|
||||
+#ifdef HAVE_INTTYPES_H
|
||||
+#include <inttypes.h>
|
||||
+#else
|
||||
+#define intptr_t long
|
||||
+#endif
|
||||
+
|
||||
#include <termios.h>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-md5hl_c,v 1.3 2004/12/04 01:01:42 fgsch Exp $
|
||||
--- md5hl.c.orig Thu May 9 20:12:59 2002
|
||||
+++ md5hl.c Fri Dec 3 20:35:32 2004
|
||||
$OpenBSD: patch-md5hl_c,v 1.4 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- md5hl.c.orig Sun Oct 24 07:18:27 2004
|
||||
+++ md5hl.c Mon Feb 21 12:02:02 2005
|
||||
@@ -23,6 +23,10 @@
|
||||
#include <stdlib.h>
|
||||
*/
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-md5hl_c,v 1.3 2004/12/04 01:01:42 fgsch Exp $
|
||||
#include "links.h"
|
||||
#include "md5.h"
|
||||
|
||||
@@ -77,5 +81,7 @@ MD5Data (const unsigned char *data, unsi
|
||||
@@ -75,5 +79,7 @@ MD5Data (const unsigned char *data, unsi
|
||||
MD5Update(&ctx,data,len);
|
||||
return MD5End(&ctx, buf);
|
||||
}
|
||||
|
||||
@ -1,84 +1,48 @@
|
||||
$OpenBSD: patch-menu_c,v 1.7 2004/12/04 01:01:42 fgsch Exp $
|
||||
--- menu.c.orig Tue Apr 20 05:08:43 2004
|
||||
+++ menu.c Fri Dec 3 20:35:32 2004
|
||||
@@ -329,7 +329,7 @@ void flush_caches(struct terminal *term,
|
||||
$OpenBSD: patch-menu_c,v 1.8 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- menu.c.orig Sat Jan 22 17:51:55 2005
|
||||
+++ menu.c Mon Feb 21 12:23:12 2005
|
||||
@@ -397,7 +397,7 @@ void flush_caches(struct terminal *term,
|
||||
/* jde v historii o psteps polozek dozadu */
|
||||
void go_backwards(struct terminal *term, void *psteps, struct session *ses)
|
||||
{
|
||||
- int steps = (int) psteps;
|
||||
+ int steps = (intptr_t) psteps;
|
||||
- long steps = (long) psteps;
|
||||
+ long steps = (intptr_t) psteps;
|
||||
|
||||
/*if (ses->tq_goto_position)
|
||||
--steps;
|
||||
@@ -363,7 +363,7 @@ void history_menu(struct terminal *term,
|
||||
foreach(l, ses->history) {
|
||||
if (n/* || ses->tq_goto_position*/) {
|
||||
if (!mi && !(mi = new_menu(3))) return;
|
||||
- add_to_menu(&mi, stracpy(l->url), "", "", MENU_FUNC go_backwards, (void *) n, 0);
|
||||
+ add_to_menu(&mi, stracpy(l->url), "", "", MENU_FUNC go_backwards, (void *)(intptr_t) n, 0);
|
||||
}
|
||||
n++;
|
||||
}
|
||||
@@ -410,7 +410,7 @@ void menu_toggle(struct terminal *term,
|
||||
@@ -481,7 +481,7 @@ void menu_toggle(struct terminal *term,
|
||||
|
||||
void display_codepage(struct terminal *term, void *pcp, struct session *ses)
|
||||
{
|
||||
- int cp = (int)pcp;
|
||||
+ int cp = (intptr_t)pcp;
|
||||
- long cp = (long)pcp;
|
||||
+ long cp = (intptr_t)pcp;
|
||||
struct term_spec *t = new_term_spec(term->term);
|
||||
if (t) t->charset = cp;
|
||||
cls_redraw_all_terminals();
|
||||
@@ -418,7 +418,7 @@ void display_codepage(struct terminal *t
|
||||
@@ -489,7 +489,7 @@ void display_codepage(struct terminal *t
|
||||
|
||||
void assumed_codepage(struct terminal *term, void *pcp, struct session *ses)
|
||||
{
|
||||
- int cp = (int)pcp;
|
||||
+ int cp = (intptr_t)pcp;
|
||||
- long cp = (long)pcp;
|
||||
+ long cp = (intptr_t)pcp;
|
||||
ses->ds.assume_cp = cp;
|
||||
redraw_terminal_cls(term);
|
||||
}
|
||||
@@ -431,7 +431,7 @@ void charset_list(struct terminal *term,
|
||||
if (!(mi = new_menu(1))) return;
|
||||
for (i = 0; (n = get_cp_name(i)); i++) {
|
||||
if (is_cp_special(i)) continue;
|
||||
- add_to_menu(&mi, get_cp_name(i), "", "", MENU_FUNC display_codepage, (void *)i, 0);
|
||||
+ add_to_menu(&mi, get_cp_name(i), "", "", MENU_FUNC display_codepage, (void *)(intptr_t)i, 0);
|
||||
}
|
||||
sel = ses->term->spec->charset;
|
||||
if (sel < 0) sel = 0;
|
||||
@@ -440,7 +440,7 @@ void charset_list(struct terminal *term,
|
||||
@@ -511,7 +511,7 @@ void charset_list(struct terminal *term,
|
||||
|
||||
void set_val(struct terminal *term, void *ip, int *d)
|
||||
{
|
||||
- *d = (int)ip;
|
||||
- *d = (long)ip;
|
||||
+ *d = (intptr_t)ip;
|
||||
}
|
||||
|
||||
void charset_sel_list(struct terminal *term, struct session *ses, int *ptr)
|
||||
@@ -450,7 +450,7 @@ void charset_sel_list(struct terminal *t
|
||||
struct menu_item *mi;
|
||||
if (!(mi = new_menu(1))) return;
|
||||
for (i = 0; (n = get_cp_name(i)); i++) {
|
||||
- add_to_menu(&mi, get_cp_name(i), "", "", MENU_FUNC set_val, (void *)i, 0);
|
||||
+ add_to_menu(&mi, get_cp_name(i), "", "", MENU_FUNC set_val, (void *)(intptr_t)i, 0);
|
||||
}
|
||||
sel = *ptr;
|
||||
if (sel < 0) sel = 0;
|
||||
@@ -1894,7 +1894,7 @@ void miscelaneous_options(struct termina
|
||||
void charset_sel_list(struct terminal *term, struct session *ses, int *ptr, int noutf8)
|
||||
@@ -1943,7 +1943,7 @@ void miscelaneous_options(struct termina
|
||||
|
||||
void menu_set_language(struct terminal *term, void *pcp, struct session *ses)
|
||||
{
|
||||
- set_language((int)pcp);
|
||||
- set_language((long)pcp);
|
||||
+ set_language((intptr_t)pcp);
|
||||
cls_redraw_all_terminals();
|
||||
}
|
||||
|
||||
@@ -1906,7 +1906,7 @@ void menu_language_list(struct terminal
|
||||
if (!(mi = new_menu(1))) return;
|
||||
for (i = 0; i < n_languages(); i++) {
|
||||
n = language_name(i);
|
||||
- add_to_menu(&mi, n, "", "", MENU_FUNC menu_set_language, (void *)i, 0);
|
||||
+ add_to_menu(&mi, n, "", "", MENU_FUNC menu_set_language, (void *)(intptr_t)i, 0);
|
||||
}
|
||||
sel = current_language;
|
||||
do_menu_selected(term, mi, ses, sel);
|
||||
|
||||
@ -1,29 +1,29 @@
|
||||
$OpenBSD: patch-objreq_c,v 1.2 2004/12/04 01:01:42 fgsch Exp $
|
||||
--- objreq.c.orig Tue Apr 20 05:08:43 2004
|
||||
+++ objreq.c Fri Dec 3 20:35:32 2004
|
||||
@@ -75,7 +75,7 @@ void auth_fn(struct dialog_data *dlg)
|
||||
$OpenBSD: patch-objreq_c,v 1.3 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- objreq.c.orig Sun Jan 2 17:17:26 2005
|
||||
+++ objreq.c Mon Feb 21 12:15:47 2005
|
||||
@@ -82,7 +82,7 @@ void auth_fn(struct dialog_data *dlg)
|
||||
|
||||
int auth_cancel(struct dialog_data *dlg, struct dialog_item_data *item)
|
||||
{
|
||||
- struct object_request *rq = find_rq((int)dlg->dlg->udata2);
|
||||
- struct object_request *rq = find_rq((long)dlg->dlg->udata2);
|
||||
+ struct object_request *rq = find_rq((intptr_t)dlg->dlg->udata2);
|
||||
if (rq) {
|
||||
rq->state = O_OK;
|
||||
if (rq->timer != -1) kill_timer(rq->timer);
|
||||
@@ -88,7 +88,7 @@ int auth_cancel(struct dialog_data *dlg,
|
||||
@@ -95,7 +95,7 @@ int auth_cancel(struct dialog_data *dlg,
|
||||
|
||||
int auth_ok(struct dialog_data *dlg, struct dialog_item_data *item)
|
||||
{
|
||||
- struct object_request *rq = find_rq((int)dlg->dlg->udata2);
|
||||
- struct object_request *rq = find_rq((long)dlg->dlg->udata2);
|
||||
+ struct object_request *rq = find_rq((intptr_t)dlg->dlg->udata2);
|
||||
if (rq) {
|
||||
struct auth_dialog *a = dlg->dlg->udata;
|
||||
struct session *ses;
|
||||
@@ -153,7 +153,7 @@ int auth_window(struct object_request *r
|
||||
@@ -156,7 +156,7 @@ int auth_window(struct object_request *r
|
||||
a->proxy = rq->stat.ce->http_code == 407;
|
||||
a->realm = stracpy(realm);
|
||||
d->udata = a;
|
||||
- d->udata2 = (void *)rq->count;
|
||||
- d->udata2 = (void *)rq->count; /* 163: warning: cast to pointer from integer of different size */
|
||||
+ d->udata2 = (void *)(intptr_t)rq->count;
|
||||
if (rq->stat.ce->http_code == 401) d->title = TEXT(T_AUTHORIZATION_REQUIRED);
|
||||
else d->title = TEXT(T_PROXY_AUTHORIZATION_REQUIRED);
|
||||
|
||||
@ -1,29 +1,20 @@
|
||||
$OpenBSD: patch-terminal_c,v 1.3 2004/12/04 01:01:42 fgsch Exp $
|
||||
--- terminal.c.orig Tue Apr 20 05:08:45 2004
|
||||
+++ terminal.c Fri Dec 3 20:35:32 2004
|
||||
@@ -1065,14 +1065,14 @@ void exec_thread(unsigned char *path, in
|
||||
$OpenBSD: patch-terminal_c,v 1.4 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- terminal.c.orig Sun Jan 2 17:17:26 2005
|
||||
+++ terminal.c Mon Feb 21 12:19:29 2005
|
||||
@@ -1059,14 +1059,14 @@ void exec_thread(unsigned char *path, in
|
||||
|
||||
void close_handle(void *p)
|
||||
{
|
||||
- int h = (int)p;
|
||||
+ int h = (intptr_t)p;
|
||||
- long h = (long)p;
|
||||
+ long h = (intptr_t)p;
|
||||
close(h);
|
||||
set_handlers(h, NULL, NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
void unblock_terminal(struct terminal *term)
|
||||
{
|
||||
- close_handle((void *)term->blocked);
|
||||
- close_handle((void *)term->blocked); /* 1087: warning: cast to pointer from integer of different size */
|
||||
+ close_handle((void *)(intptr_t)term->blocked);
|
||||
term->blocked = -1;
|
||||
if (!F) {
|
||||
set_handlers(term->fdin, (void (*)(void *))in_term, NULL, (void (*)(void *))destroy_terminal, term);
|
||||
@@ -1133,7 +1133,7 @@ void exec_on_terminal(struct terminal *t
|
||||
if (!F) set_handlers(term->fdin, NULL, NULL, (void (*)(void *))destroy_terminal, term);
|
||||
/*block_itrm(term->fdin);*/
|
||||
} else {
|
||||
- set_handlers(blockh, close_handle, NULL, close_handle, (void *)blockh);
|
||||
+ set_handlers(blockh, close_handle, NULL, close_handle, (void *)(intptr_t)blockh);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-url_c,v 1.3 2004/12/04 01:01:42 fgsch Exp $
|
||||
--- url.c.orig Tue Apr 20 05:08:45 2004
|
||||
+++ url.c Fri Dec 3 20:35:32 2004
|
||||
@@ -28,6 +28,7 @@ struct {
|
||||
$OpenBSD: patch-url_c,v 1.4 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- url.c.orig Sun Jan 2 17:17:26 2005
|
||||
+++ url.c Mon Feb 21 12:09:06 2005
|
||||
@@ -29,6 +29,7 @@ struct {
|
||||
#ifdef JS
|
||||
{"javascript", 0, NULL, javascript_func, 1, 0, 0, 0},
|
||||
#endif
|
||||
+ {"ed2k", 0, NULL, NULL, 0, 1, 0, 0},
|
||||
{NULL, 0, NULL}
|
||||
{NULL, 0, NULL, NULL, 0, 0, 0, 0}
|
||||
};
|
||||
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
$OpenBSD: patch-view_c,v 1.8 2004/12/04 01:01:42 fgsch Exp $
|
||||
--- view.c.orig Wed Apr 28 09:28:00 2004
|
||||
+++ view.c Fri Dec 3 20:35:32 2004
|
||||
@@ -1953,7 +1953,7 @@ void back(struct session *ses, struct f_
|
||||
$OpenBSD: patch-view_c,v 1.9 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- view.c.orig Sat Jan 22 17:51:55 2005
|
||||
+++ view.c Mon Feb 21 12:09:39 2005
|
||||
@@ -2105,7 +2105,7 @@ void back(struct session *ses, struct f_
|
||||
|
||||
void selected_item(struct terminal *term, void *pitem, struct session *ses)
|
||||
{
|
||||
- int item = (int)pitem;
|
||||
+ int item = (intptr_t)pitem;
|
||||
int old_item=item;
|
||||
- long item = (long)pitem;
|
||||
+ long item = (intptr_t)pitem;
|
||||
long old_item=item;
|
||||
struct f_data_c *f = current_frame(ses);
|
||||
struct link *l;
|
||||
@@ -2903,7 +2903,7 @@ void send_event(struct session *ses, str
|
||||
@@ -3112,7 +3112,7 @@ void send_event(struct session *ses, str
|
||||
goto x;
|
||||
}
|
||||
if ((upcase(ev->x) == 'Q' && !ev->y) || ev->x == KBD_CTRL_C) {
|
||||
- exit_prog(ses->term, (void *)(ev->x == KBD_CTRL_C), ses);
|
||||
+ exit_prog(ses->term, (void *)(intptr_t)(ev->x == KBD_CTRL_C), ses);
|
||||
- exit_prog(ses->term, (void *)(ev->x == KBD_CTRL_C), ses); /* 2989: warning: cast to pointer from integer of different size */
|
||||
+ exit_prog(ses->term, (void *)(intptr_t)(ev->x == KBD_CTRL_C), ses);
|
||||
goto x;
|
||||
}
|
||||
if (ev->x == KBD_CLOSE){
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-x_c,v 1.8 2004/12/04 01:09:56 fgsch Exp $
|
||||
--- x.c.orig Fri Dec 3 22:04:59 2004
|
||||
+++ x.c Fri Dec 3 22:05:21 2004
|
||||
@@ -314,6 +314,7 @@ static int x_translate_key(XKeyEvent *e,
|
||||
$OpenBSD: patch-x_c,v 1.9 2005/02/24 22:24:55 fgsch Exp $
|
||||
--- x.c.orig Sun Jan 2 17:17:26 2005
|
||||
+++ x.c Mon Feb 21 12:02:02 2005
|
||||
@@ -326,6 +326,7 @@ static int x_translate_key(XKeyEvent *e,
|
||||
/* alt, control, shift ... */
|
||||
if (e->state&ControlMask)*flag|=KBD_CTRL;
|
||||
if (e->state&Mod1Mask)*flag|=KBD_ALT;
|
||||
+ if (e->state&ShiftMask)*flag|=KBD_SHIFT;
|
||||
+ /* if (e->state&ShiftMask)*flag|=KBD_SHIFT; */
|
||||
|
||||
/* alt-f4 */
|
||||
if (((*flag)&KBD_ALT)&&(ks==XK_F4)){*key=KBD_CTRL_C;*flag=0;return 1;}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user