annotate lib-src/vcdiff @ 5200:70ed8a0d8da8

port Mule-ization of mule-wnnfns.c from ben-unicode-internal -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-04-12 Ben Wing <ben@xemacs.org> * charset.h: * lisp.h: * lisp.h (XREALLOC_ARRAY): * text.h: Port charset_codepoint_to_itext(), buffer_itext_to_charset_codepoint(), EXTBYTE_STRING_TO_ALLOCA(), `enum converr' from ben-unicode-internal, for use with the mule-wnnfns.c changes. * mule-wnnfns.c: * mule-wnnfns.c (Fwnn_open): * mule-wnnfns.c (Fwnn_dict_add): * mule-wnnfns.c (Fwnn_dict_list): * mule-wnnfns.c (Fwnn_get_zenkouho): * mule-wnnfns.c (Fwnn_inspect): * mule-wnnfns.c (Fwnn_bunsetu_kanji): * mule-wnnfns.c (Fwnn_bunsetu_yomi): * mule-wnnfns.c (Fwnn_word_info): * mule-wnnfns.c (Fwnn_dict_search): * mule-wnnfns.c (Fwnn_get_msg): * mule-wnnfns.c (Fwnn_fuzokugo_set): * mule-wnnfns.c (Fwnn_fuzokugo_get): * mule-wnnfns.c (Fwnn_hinsi_list): * mule-wnnfns.c (Fwnn_fisys_dict_add): * mule-wnnfns.c (Fwnn_fiusr_dict_add): * mule-wnnfns.c (Fwnn_notrans_dict_add): * mule-wnnfns.c (Fwnn_bmodify_dict_add): * mule-wnnfns.c (reinit_vars_of_mule_wnn): * mule-wnnfns.c (vars_of_mule_wnn): * mule-wnnfns.c (w2m): * mule-wnnfns.c (m2w): * mule-wnnfns.c (yes_or_no): * mule-wnnfns.c (puts2): * mule-wnnfns.c (check_wnn_server_type): Mule-ize, borrowed from ben-unicode-internal.
author Ben Wing <ben@xemacs.org>
date Mon, 12 Apr 2010 00:55:04 -0500
parents 376386a54a3c
children 061f4f90f874 06dd936cde16
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 #!/bin/sh
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 # Enhanced sccs diff utility for use with vc mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 # This version is more compatible with rcsdiff(1).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 # !Id: vcdiff,v 1.4 1993/12/03 09:29:18 eggert Exp !
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 # Modified by: vladimir@Eng.Sun.COM on 95-06-07
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 # * Made sure that file arguments are specifed as s.<filename>.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 # * Switched the assignments to $f inside the 3rd and 4th case statements of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 # the first for-loop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 # * Removed the incorrect initialization of sid1 before the first for-loop.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 DIFF="diff"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 echo=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 sid1= sid2=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 for f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 -*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 --brief)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 DIFF=cmp;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 -q)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 echo=:;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 -r?*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 case $sid1 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 -r*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 sid2=$f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 case $sid2 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 ?*) echo "$usage" >&2; exit 2 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 sid1=$f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 options="$options $f"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 shift
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 break
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 done
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 case $# in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 echo "$usage" >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 exit 2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 rev1= rev2= status=0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 trap 'status=2; exit' 1 2 13 15
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 for f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 s=2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 # For files under SCCS control, fixup the file name to be the s. filename
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 if [ -d SCCS ]; then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 f="SCCS/s.$f"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 s.* | */s.*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 rev1=/tmp/geta$$
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 get -s -p -k $sid1 "$f" > $rev1 &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 case $sid2 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 '')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 workfile=`expr " /$f" : '.*/s.\(.*\)'`
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 rev2=/tmp/getb$$
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 get -s -p -k $sid2 "$f" > $rev2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 workfile=$rev2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 $echo $DIFF $options $sid1 $sid2 $workfile >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 $DIFF $options $rev1 $workfile
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 s=$?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 echo "$0: $f is not an SCCS file" >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 if test $status -lt $s
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 then status=$s
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 done