OSDN > Buscar Software > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim

Commit MetaInfo

Revisión	d4bc24e6a28144ebb16f143efb72ffdd98bbe0fc (tree)
Tiempo	2006-11-02 02:12:57
Autor	vimboss
Commiter	vimboss

Log Message

updated for version 7.0-156

Cambiar Resumen

modified: src/feature.h (diff)
modified: src/mbyte.c (diff)
modified: src/memfile.c (diff)
modified: src/memline.c (diff)
modified: src/os_amiga.c (diff)
modified: src/os_amiga.h (diff)
modified: src/pty.c (diff)
modified: src/version.c (diff)

Diferencia incremental

diff -r 82b2594be408 -r d4bc24e6a281 src/feature.h

--- a/src/feature.h Wed Nov 01 14:32:36 2006 +0000

+++ b/src/feature.h Wed Nov 01 17:12:57 2006 +0000

		@@ -1133,7 +1133,7 @@
1133	1133	/*
1134	1134	* +ARP Amiga only. Use arp.library, DOS 2.0 is not required.
1135	1135	*/
1136		-#ifndef NO_ARP
	1136	+#if !defined(NO_ARP) && !defined(__amigaos4__)
1137	1137	# define FEAT_ARP
1138	1138	#endif
1139	1139

diff -r 82b2594be408 -r d4bc24e6a281 src/mbyte.c

--- a/src/mbyte.c Wed Nov 01 14:32:36 2006 +0000

+++ b/src/mbyte.c Wed Nov 01 17:12:57 2006 +0000

		@@ -667,7 +667,7 @@
667	667	* API */
668	668	n = IsDBCSLeadByteEx(enc_dbcs, (BYTE)i) ? 2 : 1;
669	669	#else
670		-# ifdef MACOS
	670	+# if defined(MACOS) \|\| defined(__amigaos4__)
671	671	/*
672	672	* if mblen() is not available, character which MSB is turned on
673	673	* are treated as leading byte character. (note : This assumption

diff -r 82b2594be408 -r d4bc24e6a281 src/memfile.c

--- a/src/memfile.c Wed Nov 01 14:32:36 2006 +0000

+++ b/src/memfile.c Wed Nov 01 17:12:57 2006 +0000

		@@ -655,7 +655,7 @@
655	655	# endif
656	656	#endif
657	657	#ifdef AMIGA
658		-# ifdef __AROS__
	658	+# if defined(__AROS__) \|\| defined(__amigaos4__)
659	659	if (fsync(mfp->mf_fd) != 0)
660	660	status = FAIL;
661	661	# else

diff -r 82b2594be408 -r d4bc24e6a281 src/memline.c

--- a/src/memline.c Wed Nov 01 14:32:36 2006 +0000

+++ b/src/memline.c Wed Nov 01 17:12:57 2006 +0000

		@@ -55,10 +55,14 @@
55	55	# include <time.h>
56	56	#endif
57	57
58		-#ifdef SASC
	58	+#if defined(SASC) \|\| defined(__amigaos4__)
59	59	# include <proto/dos.h> /* for Open() and Close() */
60	60	#endif
61	61
	62	+#ifdef HAVE_ERRNO_H
	63	+# include <errno.h>
	64	+#endif
	65	+
62	66	typedef struct block0 ZERO_BL; /* contents of the first block */
63	67	typedef struct pointer_block PTR_BL; /* contents of a pointer block */
64	68	typedef struct data_block DATA_BL; /* contents of a data block */

		@@ -4481,7 +4485,7 @@
4481	4485	curchnk = buf->b_ml.ml_chunksize + curix;
4482	4486
4483	4487	if (updtype == ML_CHNK_DELLINE)
4484		- len *= -1;
	4488	+ len = -len;
4485	4489	curchnk->mlcs_totalsize += len;
4486	4490	if (updtype == ML_CHNK_ADDLINE)
4487	4491	{

diff -r 82b2594be408 -r d4bc24e6a281 src/os_amiga.c

--- a/src/os_amiga.c Wed Nov 01 14:32:36 2006 +0000

+++ b/src/os_amiga.c Wed Nov 01 17:12:57 2006 +0000

		@@ -30,20 +30,31 @@
30	30	# include <exec/types.h>
31	31	# include <exec/exec.h>
32	32	# include <libraries/dos.h>
33		-# include <libraries/dosextens.h>
34	33	# include <intuition/intuition.h>
35		-#else
36		-# include <proto/dos.h>
37		-# include <libraries/dosextens.h>
38		-# include <proto/intuition.h>
39		-# include <proto/exec.h>
40	34	#endif
41	35
	36	+/* XXX These are included from os_amiga.h
	37	+#include <proto/exec.h>
	38	+#include <proto/dos.h>
	39	+#include <proto/intuition.h>
	40	+*/
	41	+
42	42	#include <exec/memory.h>
	43	+#include <libraries/dosextens.h>
43	44
44	45	#include <dos/dostags.h> /* for 2.0 functions */
45	46	#include <dos/dosasl.h>
46	47
	48	+/* From version 4 of AmigaOS, several system structures must be allocated
	49	+ * and freed using system functions. "struct AnchorPath" is one.
	50	+ */
	51	+#ifdef __amigaos4__
	52	+# include <dos/anchorpath.h>
	53	+# define free_fib(x) FreeDosObject(DOS_FIB, x)
	54	+#else
	55	+# define free_fib(x) vim_free(fib)
	56	+#endif
	57	+
47	58	#if defined(LATTICE) && !defined(SASC) && defined(FEAT_ARP)
48	59	# include <libraries/arp_pragmas.h>
49	60	#endif

		@@ -56,7 +67,9 @@
56	67	#undef FALSE
57	68	#define FALSE (0)
58	69
59		-#if !defined(AZTEC_C) && !defined(__AROS__)
	70	+#ifdef __amigaos4__
	71	+# define dos_packet(a, b, c) DoPkt(a, b, c, 0, 0, 0, 0)
	72	+#elif !defined(AZTEC_C) && !defined(__AROS__)
60	73	static long dos_packet __ARGS((struct MsgPort *, long, long));
61	74	#endif
62	75	static int lock2name __ARGS((BPTR lock, char_u *buf, long len));

		@@ -68,7 +81,9 @@
68	81	static BPTR raw_out = (BPTR)NULL;
69	82	static int close_win = FALSE; /* set if Vim opened the window */
70	83
	84	+#ifndef __amigaos4__ /* Use autoopen for AmigaOS4 */
71	85	struct IntuitionBase *IntuitionBase = NULL;
	86	+#endif
72	87	#ifdef FEAT_ARP
73	88	struct ArpBase *ArpBase = NULL;
74	89	#endif

		@@ -186,9 +201,17 @@
186	201	mch_avail_mem(special)
187	202	int special;
188	203	{
	204	+#ifdef __amigaos4__
	205	+ return (long_u)AvailMem(MEMF_ANY);
	206	+#else
189	207	return (long_u)AvailMem(special ? (long)MEMF_CHIP : (long)MEMF_ANY);
	208	+#endif
190	209	}
191	210
	211	+/*
	212	+ * Waits a specified amount of time, or until input arrives if
	213	+ * ignoreinput is FALSE.
	214	+ */
192	215	void
193	216	mch_delay(msec, ignoreinput)
194	217	long msec;

		@@ -252,6 +275,7 @@
252	275	out_flush();
253	276
254	277	wb_window = NULL;
	278	+#ifndef __amigaos4__
255	279	if ((IntuitionBase = (struct IntuitionBase *)
256	280	OpenLibrary((UBYTE *)intlibname, 0L)) == NULL)
257	281	{

		@@ -260,6 +284,7 @@
260	284	mch_errmsg("!?\n");
261	285	mch_exit(3);
262	286	}
	287	+#endif
263	288	}
264	289
265	290	#include <workbench/startup.h>

		@@ -284,7 +309,7 @@
284	309	{
285	310	int i;
286	311	BPTR nilfh, fh;
287		- char_u buf1[20];
	312	+ char_u buf1[24];
288	313	char_u buf2[BUF2SIZE];
289	314	static char_u (constrings[3]) = {(char_u )"con:0/0/662/210/",
290	315	(char_u *)"con:0/0/640/200/",

		@@ -295,35 +320,39 @@
295	320	char *av;
296	321	char_u *device = NULL;
297	322	int exitval = 4;
	323	+#ifndef __amigaos4__
298	324	struct Library *DosBase;
	325	+#endif
299	326	int usewin = FALSE;
300	327
301	328	/*
302	329	* check if we are running under DOS 2.0x or higher
303	330	*/
	331	+#ifndef __amigaos4__
304	332	DosBase = OpenLibrary(DOS_LIBRARY, 37L);
305	333	if (DosBase != NULL)
306	334	/* if (((struct Library )DOSBase)->lib_Version >= 37) /
307	335	{
308	336	CloseLibrary(DosBase);
309		-#ifdef FEAT_ARP
	337	+# ifdef FEAT_ARP
310	338	dos2 = TRUE;
311		-#endif
	339	+# endif
312	340	}
313	341	else /* without arp functions we NEED 2.0 */
314	342	{
315		-#ifndef FEAT_ARP
	343	+# ifndef FEAT_ARP
316	344	mch_errmsg(_("Need Amigados version 2.04 or later\n"));
317	345	exit(3);
318		-#else
	346	+# else
319	347	/* need arp functions for dos 1.x */
320	348	if (!(ArpBase = (struct ArpBase ) OpenLibrary((UBYTE )ArpName, ArpVersion)))
321	349	{
322	350	fprintf(stderr, _("Need %s version %ld\n"), ArpName, ArpVersion);
323	351	exit(3);
324	352	}
325		-#endif
	353	+# endif
326	354	}
	355	+#endif /* __amigaos4__ */
327	356
328	357	/*
329	358	* scan argv[] for the "-f" and "-d" arguments

		@@ -398,8 +427,15 @@
398	427	/*
399	428	* Make a unique name for the temp file (which we will not delete!).
400	429	* Use a pointer on the stack (nobody else will be using it).
	430	+ * Under AmigaOS4, this assumption might change in the future, so
	431	+ * we use a pointer to the current task instead. This should be a
	432	+ * shared structure and thus globally unique.
401	433	*/
	434	+#ifdef __amigaos4__
	435	+ sprintf((char *)buf1, "t:nc%p", FindTask(0));
	436	+#else
402	437	sprintf((char *)buf1, "t:nc%ld", (long)buf1);
	438	+#endif
403	439	if ((fh = Open((UBYTE *)buf1, (long)MODE_NEWFILE)) == (BPTR)NULL)
404	440	{
405	441	mch_errmsg(_("Cannot create "));

		@@ -513,7 +549,8 @@
513	549
514	550	/*
515	551	* fname_case(): Set the case of the file name, if it already exists.
516		- * This will cause the file name to remain exactly the same.
	552	+ * This will cause the file name to remain exactly the same
	553	+ * if the file system ignores, but preserves case.
517	554	*/
518	555	/ARGSUSED/
519	556	void

		@@ -528,9 +565,14 @@
528	565	if (fib != NULL)
529	566	{
530	567	flen = STRLEN(name);
	568	+ /* TODO: Check if this fix applies to AmigaOS < 4 too.*/
	569	+#ifdef __amigaos4__
	570	+ if (fib->fib_DirEntryType == ST_ROOT)
	571	+ strcat(fib->fib_FileName, ":");
	572	+#endif
531	573	if (flen == strlen(fib->fib_FileName)) /* safety check */
532	574	mch_memmove(name, fib->fib_FileName, flen);
533		- vim_free(fib);
	575	+ free_fib(fib);
534	576	}
535	577	}
536	578

		@@ -548,13 +590,17 @@
548	590
549	591	if (fname == NULL) /* safety check */
550	592	return NULL;
551		- fib = (struct FileInfoBlock *)malloc(sizeof(struct FileInfoBlock));
	593	+#ifdef __amigaos4__
	594	+ fib = AllocDosObject(DOS_FIB,0);
	595	+#else
	596	+ fib = (struct FileInfoBlock *)alloc(sizeof(struct FileInfoBlock));
	597	+#endif
552	598	if (fib != NULL)
553	599	{
554	600	flock = Lock((UBYTE *)fname, (long)ACCESS_READ);
555	601	if (flock == (BPTR)NULL \|\| !Examine(flock, fib))
556	602	{
557		- vim_free(fib); /* in case of an error the memory is freed here */
	603	+ free_fib(fib); /* in case of an error the memory is freed here */
558	604	fib = NULL;
559	605	}
560	606	if (flock)

		@@ -613,6 +659,7 @@
613	659	char_u *s;
614	660	int len;
615	661	{
	662	+ /* TODO: Implement this. */
616	663	*s = NUL;
617	664	return FAIL;
618	665	}

		@@ -625,7 +672,11 @@
625	672	char_u *s;
626	673	int len;
627	674	{
	675	+#if defined(__amigaos4__) && defined(__CLIB2__)
	676	+ gethostname(s, len);
	677	+#else
628	678	vim_strncpy(s, "Amiga", len - 1);
	679	+#endif
629	680	}
630	681
631	682	/*

		@@ -634,7 +685,14 @@
634	685	long
635	686	mch_get_pid()
636	687	{
	688	+#ifdef __amigaos4__
	689	+ /* This is as close to a pid as we can come. We could use CLI numbers also,
	690	+ * but then we would have two different types of process identifiers.
	691	+ */
	692	+ return((long)FindTask(0));
	693	+#else
637	694	return (long)0;
	695	+#endif
638	696	}
639	697
640	698	/*

		@@ -746,7 +804,7 @@
746	804	if (fib != NULL)
747	805	{
748	806	retval = fib->fib_Protection;
749		- vim_free(fib);
	807	+ free_fib(fib);
750	808	}
751	809	return retval;
752	810	}

		@@ -790,8 +848,12 @@
790	848	fib = get_fib(name);
791	849	if (fib != NULL)
792	850	{
	851	+#ifdef __amigaos4__
	852	+ retval = (FIB_IS_DRAWER(fib)) ? TRUE : FALSE;
	853	+#else
793	854	retval = ((fib->fib_DirEntryType >= 0) ? TRUE : FALSE);
794		- vim_free(fib);
	855	+#endif
	856	+ free_fib(fib);
795	857	}
796	858	return retval;
797	859	}

		@@ -912,7 +974,7 @@
912	974	mch_settmode(tmode)
913	975	int tmode;
914	976	{
915		-#ifdef __AROS__
	977	+#if defined(__AROS__) \|\| defined(__amigaos4__)
916	978	if (!SetMode(raw_in, tmode == TMODE_RAW ? 1 : 0))
917	979	#else
918	980	if (dos_packet(MP(raw_in), (long)ACTION_SCREEN_MODE,

		@@ -954,14 +1016,21 @@
954	1016	mch_get_shellsize()
955	1017	{
956	1018	struct ConUnit *conUnit;
	1019	+#ifndef __amigaos4__
957	1020	char id_a[sizeof(struct InfoData) + 3];
958		- struct InfoData *id;
	1021	+#endif
	1022	+ struct InfoData *id=0;
959	1023
960	1024	if (!term_console) /* not an amiga window */
961		- return FAIL;
	1025	+ goto out;
962	1026
963	1027	/* insure longword alignment */
	1028	+#ifdef __amigaos4__
	1029	+ if(!(id = AllocDosObject(DOS_INFODATA, 0)))
	1030	+ goto out;
	1031	+#else
964	1032	id = (struct InfoData *)(((long)id_a + 3L) & ~3L);
	1033	+#endif
965	1034
966	1035	/*
967	1036	* Should make console aware of real window size, not the one we set.

		@@ -983,7 +1052,7 @@
983	1052	/* it's not an amiga window, maybe aux device */
984	1053	/* terminal type should be set */
985	1054	term_console = FALSE;
986		- return FAIL;
	1055	+ goto out;
987	1056	}
988	1057	if (oldwindowtitle == NULL)
989	1058	oldwindowtitle = (char_u *)wb_window->Title;

		@@ -1006,6 +1075,12 @@
1006	1075	}
1007	1076
1008	1077	return OK;
	1078	+out:
	1079	+#ifdef __amigaos4__
	1080	+ FreeDosObject(DOS_INFODATA, id); /* Safe to pass NULL */
	1081	+#endif
	1082	+
	1083	+ return FAIL;
1009	1084	}
1010	1085
1011	1086	/*

		@@ -1046,7 +1121,7 @@
1046	1121	OUT_STR_NF(tltoa((unsigned long)n));
1047	1122	}
1048	1123
1049		-#if !defined(AZTEC_C) && !defined(__AROS__)
	1124	+#if !defined(AZTEC_C) && !defined(__AROS__) && !defined(__amigaos4__)
1050	1125	/*
1051	1126	* Sendpacket.c
1052	1127	*

		@@ -1371,8 +1446,12 @@
1371	1446	* Use and abuse as you please.
1372	1447	*/
1373	1448
1374		-#define ANCHOR_BUF_SIZE (512)
1375		-#define ANCHOR_SIZE (sizeof(struct AnchorPath) + ANCHOR_BUF_SIZE)
	1449	+#ifdef __amigaos4__
	1450	+# define ANCHOR_BUF_SIZE 1024
	1451	+#else
	1452	+# define ANCHOR_BUF_SIZE (512)
	1453	+# define ANCHOR_SIZE (sizeof(struct AnchorPath) + ANCHOR_BUF_SIZE)
	1454	+#endif
1376	1455
1377	1456	int
1378	1457	mch_expandpath(gap, pat, flags)

		@@ -1385,19 +1464,32 @@
1385	1464	char_u starbuf, sp, *dp;
1386	1465	int start_len;
1387	1466	int matches;
	1467	+#ifdef __amigaos4__
	1468	+ struct TagItem AnchorTags[] = {
	1469	+ {ADO_Strlen, ANCHOR_BUF_SIZE},
	1470	+ {ADO_Flags, APF_DODOT\|APF_DOWILD\|APF_MultiAssigns},
	1471	+ {TAG_DONE, 0L}
	1472	+ };
	1473	+#endif
1388	1474
1389	1475	start_len = gap->ga_len;
1390	1476
1391	1477	/* Get our AnchorBase */
	1478	+#ifdef __amigaos4__
	1479	+ Anchor = AllocDosObject(DOS_ANCHORPATH, AnchorTags);
	1480	+#else
1392	1481	Anchor = (struct AnchorPath *)alloc_clear((unsigned)ANCHOR_SIZE);
	1482	+#endif
1393	1483	if (Anchor == NULL)
1394	1484	return 0;
1395	1485
	1486	+#ifndef __amigaos4__
1396	1487	Anchor->ap_Strlen = ANCHOR_BUF_SIZE; /* ap_Length not supported anymore */
1397		-#ifdef APF_DODOT
	1488	+# ifdef APF_DODOT
1398	1489	Anchor->ap_Flags = APF_DODOT \| APF_DOWILD; /* allow '.' for current dir */
1399		-#else
	1490	+# else
1400	1491	Anchor->ap_Flags = APF_DoDot \| APF_DoWild; /* allow '.' for current dir */
	1492	+# endif
1401	1493	#endif
1402	1494
1403	1495	#ifdef FEAT_ARP

		@@ -1432,7 +1524,11 @@
1432	1524	*/
1433	1525	while (Result == 0)
1434	1526	{
	1527	+#ifdef __amigaos4__
	1528	+ addfile(gap, (char_u *)Anchor->ap_Buffer, flags);
	1529	+#else
1435	1530	addfile(gap, (char_u *)Anchor->ap_Buf, flags);
	1531	+#endif
1436	1532	#ifdef FEAT_ARP
1437	1533	if (dos2)
1438	1534	#endif

		@@ -1469,7 +1565,11 @@
1469	1565	#endif
1470	1566
1471	1567	Return:
	1568	+#ifdef __amigaos4__
	1569	+ FreeDosObject(DOS_ANCHORPATH, Anchor);
	1570	+#else
1472	1571	vim_free(Anchor);
	1572	+#endif
1473	1573
1474	1574	return matches;
1475	1575	}

diff -r 82b2594be408 -r d4bc24e6a281 src/os_amiga.h

--- a/src/os_amiga.h Wed Nov 01 14:32:36 2006 +0000

+++ b/src/os_amiga.h Wed Nov 01 17:12:57 2006 +0000

		@@ -17,9 +17,12 @@
17	17	#define HAVE_AVAIL_MEM
18	18
19	19	#ifndef HAVE_CONFIG_H
20		-# ifdef AZTEC_C
	20	+# if defined(AZTEC_C) \|\| defined(__amigaos4__)
21	21	# define HAVE_STAT_H
22	22	# endif
	23	+# ifdef __amigaos4__
	24	+# define HAVE_STDARG_H
	25	+# endif
23	26	# define HAVE_STDLIB_H
24	27	# define HAVE_STRING_H
25	28	# define HAVE_FCNTL_H

		@@ -34,15 +37,24 @@
34	37	# define HAVE_DATE_TIME
35	38	# endif
36	39
37		-#define DFLT_ERRORFILE "AztecC.Err"
38		-#define DFLT_RUNTIMEPATH "home:vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,home:vimfiles/after"
	40	+#endif /* HAVE_CONFIG_H */
39	41
40		-#define BASENAMELEN 26 /* Amiga */
	42	+#ifndef DFLT_ERRORFILE
	43	+# define DFLT_ERRORFILE "AztecC.Err" /* Should this change? */
	44	+#endif
41	45
42		-#define TEMPNAME "t:v?XXXXXX"
43		-#define TEMPNAMELEN 12
	46	+#ifndef DFLT_RUNTIMEPATH
	47	+# define DFLT_RUNTIMEPATH "home:vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,home:vimfiles/after"
	48	+#endif
44	49
45		-#endif /* HAVE_CONFIG_H */
	50	+#ifndef BASENAMELEN
	51	+# define BASENAMELEN 26 /* Amiga */
	52	+#endif
	53	+
	54	+#ifndef TEMPNAME
	55	+# define TEMPNAME "t:v?XXXXXX"
	56	+# define TEMPNAMELEN 12
	57	+#endif
46	58
47	59	#include <exec/types.h>
48	60	#include <libraries/dos.h>

		@@ -155,9 +167,9 @@
155	167	#endif
156	168
157	169	#ifdef FEAT_VIMINFO
158		-#ifndef VIMINFO_FILE
159		-# define VIMINFO_FILE "s:.viminfo"
160		-#endif
	170	+# ifndef VIMINFO_FILE
	171	+# define VIMINFO_FILE "s:.viminfo"
	172	+# endif
161	173	#endif /* FEAT_VIMINFO */
162	174
163	175	#ifndef EXRC_FILE

diff -r 82b2594be408 -r d4bc24e6a281 src/pty.c

--- a/src/pty.c Wed Nov 01 14:32:36 2006 +0000

+++ b/src/pty.c Wed Nov 01 17:12:57 2006 +0000

		@@ -51,7 +51,7 @@
51	51	# include <sys/termios.h>
52	52	#endif
53	53
54		-#if HAVE_SYS_IOCTL_H
	54	+#ifdef HAVE_SYS_IOCTL_H
55	55	# include <sys/ioctl.h>
56	56	#endif
57	57

		@@ -69,14 +69,14 @@
69	69	# endif
70	70	#endif
71	71
72		-#if HAVE_UNISTD_H
	72	+#ifdef HAVE_UNISTD_H
73	73	# include <unistd.h>
74	74	#endif
75	75
76	76	#if HAVE_TERMIO_H
77	77	# include <termio.h>
78	78	#else
79		-# if HAVE_TERMIOS_H
	79	+# ifdef HAVE_TERMIOS_H
80	80	# include <termios.h>
81	81	# endif
82	82	#endif

diff -r 82b2594be408 -r d4bc24e6a281 src/version.c

--- a/src/version.c Wed Nov 01 14:32:36 2006 +0000

+++ b/src/version.c Wed Nov 01 17:12:57 2006 +0000

		@@ -667,6 +667,8 @@
667	667	static int included_patches[] =
668	668	{ /* Add new patch number below this line */
669	669	/**/
	670	+ 156,
	671	+/**/
670	672	155,
671	673	/**/
672	674	154,

Show on old repository browser