diff -Nru drawterm-0.cvs+20081209.1/cpu.c drawterm-20091003/cpu.c --- drawterm-0.cvs+20081209.1/cpu.c 2008-12-06 23:31:02.000000000 +0000 +++ drawterm-20091003/cpu.c 2009-08-26 06:47:43.000000000 +0100 @@ -29,6 +29,7 @@ static char *system; static int cflag; extern int dbg; +extern char* base; // fs base for devroot static char *srvname = "ncpu"; static char *ealgs = "rc4_256 sha1"; @@ -146,12 +147,15 @@ case 'k': keyspec = EARGF(usage()); break; - case 'u': - user = EARGF(usage()); + case 'r': + base = EARGF(usage()); break; case 's': secstoreserver = EARGF(usage()); break; + case 'u': + user = EARGF(usage()); + break; default: usage(); }ARGEND; diff -Nru drawterm-0.cvs+20081209.1/debian/changelog drawterm-20091003/debian/changelog --- drawterm-0.cvs+20081209.1/debian/changelog 2010-05-09 16:01:57.000000000 +0100 +++ drawterm-20091003/debian/changelog 2010-05-09 16:01:57.000000000 +0100 @@ -1,3 +1,13 @@ +drawterm (20091003-1) unstable; urgency=low + + * Merged own manpage with one provided by uptream in private mail. + * Updated dummy watchfile. + * New upstream release. + * debian/rules: remove dh_clean -k. + * debian/control: bumped Standards-Version, no changes. + + -- Martín Ferrari Thu, 18 Feb 2010 02:56:59 +0100 + drawterm (0.cvs+20081209.1-1) unstable; urgency=low * The "should ask upstream for help before fighting for hours to solve diff -Nru drawterm-0.cvs+20081209.1/debian/control drawterm-20091003/debian/control --- drawterm-0.cvs+20081209.1/debian/control 2010-05-09 16:01:57.000000000 +0100 +++ drawterm-20091003/debian/control 2010-05-09 16:01:57.000000000 +0100 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Martín Ferrari Build-Depends: debhelper (>= 7), libxt-dev -Standards-Version: 3.8.0 +Standards-Version: 3.8.4 Homepage: http://swtch.com/drawterm/ Vcs-Browser: http://canterville.mine.nu/wsvn/debian/trunk/drawterm/ diff -Nru drawterm-0.cvs+20081209.1/debian/drawterm.1 drawterm-20091003/debian/drawterm.1 --- drawterm-0.cvs+20081209.1/debian/drawterm.1 2010-05-09 16:01:57.000000000 +0100 +++ drawterm-20091003/debian/drawterm.1 2010-05-09 16:01:57.000000000 +0100 @@ -16,7 +16,7 @@ .\" .sp insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -drawterm \- graphical client for Plan 9 CPU servers +drawterm \- connect to Plan 9 CPU servers from other operating systems .SH SYNOPSIS .B drawterm .RB [ \-d ]\| @@ -24,27 +24,37 @@ .IR authserver ] .RB [ -c .IR cpuserver ] -.RB [ -C -.IR command ] .RB [ -e .IR encription_hash_algs ] .RB [ -k .IR keyspec ] -.RB [ -u -.IR username ] .RB [ -s .IR secstoreserver ] +.RB [ -u +.IR username ] +.RB [ -C +.I command args +.IR ... ] .br .SH DESCRIPTION -This manual page documents briefly the -.B drawterm -command. +\fBdrawterm\fP is not a Plan 9 program. +It is a program that users of non-Plan 9 systems can use to establish +graphical +.BR cpu (1) +connections with Plan 9 CPU servers. Just as a real Plan 9 terminal does, a +\fBdrawterm\fP serves its local name space as well as some devices (the +keyboard, mouse, and screen) to a remote CPU server, which mounts this name +space on +.I /mnt/term +and starts a shell. +Typically, either explicitly or via the profile, one uses the shell to start +.BR rio (1). + .PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBdrawterm\fP is a graphical program that connects to a remote Plan 9 CPU -server, performing authentication with the specified authentication server. +By default, drawterm uses the CPU server \fB$cpu\fP or \fIcpu\fP, and the +authentication server \fB$auth\fP or \fIauth\fP, + + .SH OPTIONS This program follows the syntax of the cpu(1) Plan 9 command. @@ -70,10 +80,31 @@ .B $USER environment variable, if present, or asks interactively for an username. .TP -.BR \-C , \-e , \-k , \-s -Undocumented options +.B \-s +Specifies the secstore server to use. +.TP +.B \-C +Specifies a command to be executed remotely. +.TP +.BR \-e , \-k +Allow for selecting the hash algorithm and keys used, they have the same +meaning as in \fBcpu\fP(1). + +.SH SOURCE +In Plan 9 distributions, \fI/sys/src/cmd/unix/drawterm\fP. + +.SH DIAGNOSTICS +Drawterm prints most diagnostics in its own window. + .SH BUGS +Although at first \fBdrawterm\fP may seem like a Plan 9 terminal, in fact it +is just a way to provide a CPU server with some terminal devices. +The difference is important because one cannot run terminal-resident programs +when using \fBdrawterm\fP. +The illusion can be improved by delicate adjustments in +\fI/usr/$user/lib/profile\fP. + Should import latest /dev/draw to allow resize of window Should copy 9term code and make console window a real 9term window instead. @@ -81,11 +112,12 @@ Should implement /dev/label. .SH SEE ALSO -.BR cpu (1) +.BR cpu (1), +.BR rio (1) in the Plan 9 documentation -.br + .SH AUTHOR drawterm was written by Russ Cox . .PP -This manual page was written by Martín Ferrari , -for the Debian project (but may be used by others). +This manual page was written by Russ Cox , with modifications +by Martín Ferrari for the Debian project. diff -Nru drawterm-0.cvs+20081209.1/debian/rules drawterm-20091003/debian/rules --- drawterm-0.cvs+20081209.1/debian/rules 2010-05-09 16:01:57.000000000 +0100 +++ drawterm-20091003/debian/rules 2010-05-09 16:01:57.000000000 +0100 @@ -18,7 +18,6 @@ install: build dh_testdir dh_testroot - dh_clean -k dh_installdirs usr/bin dh_install drawterm usr/bin diff -Nru drawterm-0.cvs+20081209.1/debian/watch drawterm-20091003/debian/watch --- drawterm-0.cvs+20081209.1/debian/watch 2010-05-09 16:01:57.000000000 +0100 +++ drawterm-20091003/debian/watch 2010-05-09 16:01:57.000000000 +0100 @@ -1,5 +1,5 @@ version=3 # Dummy, upstream doesn't show the version -opts=uversionmangle=s/.*/0.cvs+20080909/ \ +opts=uversionmangle=s/.*/0.cvs+20081209.1/ \ http://swtch.com/drawterm/ (drawterm).tgz diff -Nru drawterm-0.cvs+20081209.1/gui-x11/x11.c drawterm-20091003/gui-x11/x11.c --- drawterm-0.cvs+20081209.1/gui-x11/x11.c 2008-12-09 07:05:08.000000000 +0000 +++ drawterm-20091003/gui-x11/x11.c 2009-08-26 06:44:41.000000000 +0100 @@ -1426,7 +1426,7 @@ uchar *data, *xdata; Atom clipboard, type, prop; unsigned long lastlen; - uint dummy, len; + unsigned long dummy, len; int fmt, i; Window w; diff -Nru drawterm-0.cvs+20081209.1/include/lib.h drawterm-20091003/include/lib.h --- drawterm-0.cvs+20081209.1/include/lib.h 2008-12-09 07:05:08.000000000 +0000 +++ drawterm-20091003/include/lib.h 2009-08-26 06:44:41.000000000 +0100 @@ -14,6 +14,7 @@ #define log2 liblog2 #define log liblog #define reboot libreboot +#define strtoll libstrtoll #undef timeradd #define timeradd xtimeradd diff -Nru drawterm-0.cvs+20081209.1/kern/devdraw.c drawterm-20091003/kern/devdraw.c --- drawterm-0.cvs+20081209.1/kern/devdraw.c 2006-05-21 18:02:03.000000000 +0100 +++ drawterm-20091003/kern/devdraw.c 2009-08-26 06:47:43.000000000 +0100 @@ -1312,7 +1312,7 @@ SET(p); USED(fmt); USED(a); - USED(buf); + p = buf; USED(p); USED(q); USED(s); diff -Nru drawterm-0.cvs+20081209.1/kern/devfs-win32.c drawterm-20091003/kern/devfs-win32.c --- drawterm-0.cvs+20081209.1/kern/devfs-win32.c 2007-05-29 13:23:05.000000000 +0100 +++ drawterm-20091003/kern/devfs-win32.c 2009-08-26 06:47:43.000000000 +0100 @@ -1,3 +1,8 @@ +/* + * Disable Unicode until the calls to FindFirstFile etc + * are changed to use wide character strings. + */ +#undef UNICODE #include #include #include @@ -593,7 +598,7 @@ d.length = stbuf.st_size; d.type = 'U'; d.dev = c->dev; - n = convD2M(&d, (char*)va+i, count-i); + n = convD2M(&d, (uchar*)va+i, count-i); if(n == BIT16SZ){ strcpy(uif->nextname, de); break; @@ -634,7 +639,7 @@ if(FindNextFile(d->handle, &d->wfd) == FALSE) return 0; } - strcpy(name, d->wfd.cFileName); + strcpy(name, (char*)d->wfd.cFileName); d->index++; return 1; diff -Nru drawterm-0.cvs+20081209.1/kern/devip-win32.c drawterm-20091003/kern/devip-win32.c --- drawterm-0.cvs+20081209.1/kern/devip-win32.c 2005-11-08 01:35:49.000000000 +0000 +++ drawterm-20091003/kern/devip-win32.c 2009-08-26 06:47:43.000000000 +0100 @@ -178,7 +178,7 @@ he = gethostbyname(host); if(he != 0 && he->h_addr_list[0]) { - p = he->h_addr_list[0]; + p = (uchar*)he->h_addr_list[0]; sprint(buf, "%ud.%ud.%ud.%ud", p[0], p[1], p[2], p[3]); } else strcpy(buf, host); diff -Nru drawterm-0.cvs+20081209.1/README drawterm-20091003/README --- drawterm-0.cvs+20081209.1/README 2006-05-21 18:02:03.000000000 +0100 +++ drawterm-20091003/README 2009-08-26 06:51:55.000000000 +0100 @@ -24,14 +24,15 @@ SOURCE ------ -Use CVS: cvs -d :pserver:anoncvs@cvs.pdos.csail.mit.edu:/cvs co drawterm -On the web at http://cvs.pdos.csail.mit.edu/cvs/drawterm -In the Plan 9 distribution: /sys/src/cmd/unix/drawterm +Use Mercurial: hg clone http://code.swtch.com/drawterm +On the web at http://code.swtch.com/drawterm +Tar file at http://swtch.com/drawterm/ +In the Plan 9 distribution: /sys/src/cmd/unix/drawterm/ (sometimes out of date) HELP ---- -Email Russ Cox with bug reports or problems. +Issue tracker: http://code.swtch.com/drawterm/issues TO DO: