Plan 9 from Bell Labs 2012-05-31

rc/bin/pdf2ps

@@ -1,19 +1,26 @@
 #!/bin/rc
-# pdf2ps [gs-options] [input.pdf] [output.ps] - generate PS from PDF
+# pdf2ps [-e] [gs-options] [input.pdf [output.ps]] - generate (e)ps from pdf
 rfork e
 
-fn cleanup { }
 fn usage {
-	echo 'usage: pdf2ps [gs-options] [input.pdf] [output.ps]' >[1=2]
+	echo 'usage: pdf2ps [-e] [gs-options] [input.pdf [output.ps]]' >[1=2]
 	exit usage
 }
 
+outdev=pswrite
+fin=/fd/0
+fout=/fd/1
 lang=(-'dLanguageLevel=2')
 opt=()
 while(! ~ $#* 0 && ~ $1 -* && ! ~ $1 - --){
 	if(~ $1 '-dLanguageLevel='*)
 		lang=()
-	opt=($opt $1)
+	if not if(~ '-?' $1)
+		usage
+	if(~ $1 -e)
+		outdev=epswrite
+	if not
+		opt=($opt $1)
 	shift
 }
 if(~ $1 --)
@@ -21,11 +28,9 @@ if(~ $1 --)
 
 switch($#*){
 case 0
-	fin=-
-	fout=-
+	;
 case 1
 	fin=$1
-	fout=-
 case 2
 	fin=$1
 	fout=$2
@@ -33,12 +38,8 @@ case *
 	usage
 }
 
-if(~ $fin -){
-	# fin=/tmp/pdf2ps.$pid.^`{date -n}
-	# fn cleanup { rm -f $fin }
-	# cat >$tmp
+if(~ $fin -)
 	fin=/fd/0
-}
 if(~ $fout -)
 	fout=/fd/1
 
@@ -46,8 +47,5 @@ if(~ $fout -)
 # pages.  We have to include the options twice because -I only takes
 # effect if it appears before other options.
 
-gs $opt -dSAFER -dNOPAUSE -dBATCH -q -s'DEVICE=pswrite' \
-	$opt $lang \
-	-s'OutputFile='$fout -c save pop -f $fin
-
-cleanup
+exec gs $opt -dSAFER -dNOPAUSE -dBATCH -q -s'DEVICE='$outdev $opt $lang \
+	-s'OutputFile=-' -c save pop -f $fin >$fout

sys/man/1/ps2pdf

@@ -15,6 +15,9 @@ ps2pdf, pdf2ps \- convert between PostScript and PDF
 .PP
 .B pdf2ps
 [
+.B -e
+]
+[
 .I gs-options
 ]
 [
@@ -38,6 +41,11 @@ nor
 .I output-file
 is not specified, they read from standard input and write to standard output.
 .PP
+Under
+.BR -e ,
+.I pdf2ps
+emits Encapsulated Postscript (eps).
+.PP
 The
 .I gs-options
 are passed to Ghostscript unaltered.

sys/src/cmd/ssh2/dup.out

@@ -214,7 +214,7 @@
 
 #39. 3 ncsl lines
 	12,ssh.c:268,270
-	12,ssh.c:310,312
+	12,ssh.c:309,311
 	0 parameters
 
 #40. 10 ncsl lines
@@ -485,8 +485,8 @@
 	0 parameters
 
 #89. 4 ncsl lines
-	12,ssh.c:421,424
-	12,ssh.c:440,443
+	12,ssh.c:420,423
+	12,ssh.c:439,442
 	1 parameters
  	1. cfd1,	cfd2
 
@@ -520,53 +520,53 @@
 	0 parameters
 
 #95. 3 ncsl lines
-	6,dial.c:141,144
-	9,netssh.c:2435,2438
+	7,dial.thread.c:177,180
+	13,sshsession.c:152,155
 	0 parameters
 
 #96. 3 ncsl lines
-	5,dh.c:808,811
-	9,netssh.c:2221,2224
+	6,dial.c:141,144
+	13,sshsession.c:152,155
 	0 parameters
 
 #97. 3 ncsl lines
 	6,dial.c:141,144
-	9,netssh.c:2221,2224
+	9,netssh.c:2435,2438
 	0 parameters
 
 #98. 3 ncsl lines
-	7,dial.thread.c:177,180
+	5,dh.c:808,811
 	9,netssh.c:2221,2224
 	0 parameters
 
 #99. 3 ncsl lines
-	5,dh.c:808,811
-	9,netssh.c:2435,2438
+	6,dial.c:141,144
+	9,netssh.c:2221,2224
 	0 parameters
 
 #100. 3 ncsl lines
-	5,dh.c:808,811
-	6,dial.c:141,144
+	7,dial.thread.c:177,180
+	9,netssh.c:2221,2224
 	0 parameters
 
 #101. 3 ncsl lines
 	5,dh.c:808,811
-	7,dial.thread.c:177,180
+	13,sshsession.c:152,155
 	0 parameters
 
 #102. 3 ncsl lines
 	5,dh.c:808,811
-	13,sshsession.c:152,155
+	9,netssh.c:2435,2438
 	0 parameters
 
 #103. 3 ncsl lines
+	5,dh.c:808,811
 	6,dial.c:141,144
-	13,sshsession.c:152,155
 	0 parameters
 
 #104. 3 ncsl lines
+	5,dh.c:808,811
 	7,dial.thread.c:177,180
-	13,sshsession.c:152,155
 	0 parameters
 
 #105. 10 ncsl lines
@@ -590,12 +590,12 @@
 
 #108. 3 ncsl lines
 	6,dial.c:275,278
-	13,sshsession.c:152,155
+	9,netssh.c:2221,2224
 	0 parameters
 
 #109. 3 ncsl lines
 	6,dial.c:275,278
-	9,netssh.c:2221,2224
+	13,sshsession.c:152,155
 	0 parameters
 
 #110. 3 ncsl lines
@@ -880,7 +880,7 @@
 
 #156. 4 ncsl lines
 	9,netssh.c:879,882
-	12,ssh.c:392,396
+	12,ssh.c:391,395
 	1 parameters
  	1. threadexits,	bail
 
@@ -890,13 +890,13 @@
 	0 parameters
 
 #158. 3 ncsl lines
-	12,ssh.c:531,533
+	12,ssh.c:530,532
 	13,sshsession.c:220,222
 	0 parameters
 
 #159. 3 ncsl lines
 	9,netssh.c:195,197
-	12,ssh.c:531,533
+	12,ssh.c:530,532
 	0 parameters
 
 #160. 6 ncsl lines
@@ -1204,7 +1204,7 @@
  	1. 'k',	'i'
 
 #207. 4 ncsl lines
-	12,ssh.c:501,504
+	12,ssh.c:500,503
 	13,sshsession.c:196,199
 	1 parameters
  	1. 'I',	'i'
@@ -1222,7 +1222,7 @@
 
 #210. 3 ncsl lines
 	12,ssh.c:278,280
-	12,ssh.c:319,322
+	12,ssh.c:318,321
 	0 parameters
 
 #211. 4 ncsl lines
@@ -1704,12 +1704,12 @@
 
 #296. 3 ncsl lines
 	9,netssh.c:1254,1256
-	12,ssh.c:332,334
+	12,ssh.c:331,333
 	0 parameters
 
 #297. 3 ncsl lines
 	9,netssh.c:2218,2220
-	12,ssh.c:332,334
+	12,ssh.c:331,333
 	0 parameters
 
 #298. 3 ncsl lines
@@ -1719,42 +1719,42 @@
 
 #299. 3 ncsl lines
 	9,netssh.c:2564,2567
-	12,ssh.c:472,475
+	13,sshsession.c:333,336
 	0 parameters
 
 #300. 3 ncsl lines
-	9,netssh.c:1505,1508
-	12,ssh.c:472,475
+	9,netssh.c:2564,2567
+	12,ssh.c:471,474
 	0 parameters
 
 #301. 3 ncsl lines
-	9,netssh.c:2564,2567
+	12,ssh.c:471,474
 	13,sshsession.c:333,336
 	0 parameters
 
 #302. 3 ncsl lines
-	12,ssh.c:472,475
-	13,sshsession.c:333,336
+	9,netssh.c:1505,1508
+	12,ssh.c:471,474
 	0 parameters
 
 #303. 3 ncsl lines
 	6,dial.c:164,167
-	12,ssh.c:282,286
+	13,sshsession.c:307,310
 	0 parameters
 
 #304. 3 ncsl lines
 	6,dial.c:164,167
-	7,dial.thread.c:149,152
+	12,ssh.c:282,286
 	0 parameters
 
 #305. 3 ncsl lines
 	6,dial.c:164,167
-	12,ssh.c:151,154
+	7,dial.thread.c:149,152
 	0 parameters
 
 #306. 3 ncsl lines
 	6,dial.c:164,167
-	13,sshsession.c:307,310
+	12,ssh.c:151,154
 	0 parameters
 
 #307. 3 ncsl lines
@@ -2371,7 +2371,7 @@
 
 #418. 5 ncsl lines
 	12,ssh.c:73,77
-	12,ssh.c:411,415
+	12,ssh.c:410,414
 	1 parameters
  	1. fd,	nfd
 
@@ -3007,7 +3007,7 @@
 
 #528. 5 ncsl lines
 	9,netssh.c:177,181
-	12,ssh.c:500,504
+	12,ssh.c:499,503
 	1 parameters
  	1. 'k',	'I'
 
@@ -3035,7 +3035,7 @@
 
 #533. 3 ncsl lines
 	9,netssh.c:802,804
-	12,ssh.c:332,334
+	12,ssh.c:331,333
 	0 parameters
 
 #534. 3 ncsl lines
@@ -3107,12 +3107,12 @@
 
 #547. 3 ncsl lines
 	9,netssh.c:734,737
-	12,ssh.c:472,475
+	13,sshsession.c:333,336
 	0 parameters
 
 #548. 3 ncsl lines
 	9,netssh.c:734,737
-	13,sshsession.c:333,336
+	12,ssh.c:471,474
 	0 parameters
 
 #549. 3 ncsl lines
@@ -3131,23 +3131,23 @@
 	0 parameters
 
 #552. 3 ncsl lines
-	6,dial.c:164,167
 	12,ssh.c:243,246
+	13,sshsession.c:307,310
 	0 parameters
 
 #553. 3 ncsl lines
-	6,dial.c:164,167
 	9,netssh.c:390,393
+	13,sshsession.c:307,310
 	0 parameters
 
 #554. 3 ncsl lines
+	6,dial.c:164,167
 	9,netssh.c:390,393
-	13,sshsession.c:307,310
 	0 parameters
 
 #555. 3 ncsl lines
+	6,dial.c:164,167
 	12,ssh.c:243,246
-	13,sshsession.c:307,310
 	0 parameters
 
 #556. 3 ncsl lines
@@ -3193,12 +3193,12 @@
 
 #564. 4 ncsl lines
 	11,rsa2ssh2.c:20,24
-	12,ssh.c:473,477
+	12,ssh.c:472,476
 	0 parameters
 
 #565. 4 ncsl lines
 	9,netssh.c:164,168
-	12,ssh.c:473,477
+	12,ssh.c:472,476
 	1 parameters
  	1. threadmain,	main
 
@@ -3246,7 +3246,7 @@
 
 #573. 4 ncsl lines
 	12,ssh.c:283,288
-	12,ssh.c:337,345
+	12,ssh.c:336,344
 	1 parameters
  	1. keyproc,	bidircopy
 
@@ -3461,27 +3461,27 @@
  	1. sl,	0
 
 #609. 4 ncsl lines
+	9,netssh.c:2434,2438
+	13,sshsession.c:151,155
+	0 parameters
+
+#610. 4 ncsl lines
+	9,netssh.c:2220,2224
+	13,sshsession.c:151,155
+	0 parameters
+
+#611. 4 ncsl lines
 	6,dial.c:519,526
 	9,netssh.c:2220,2224
 	1 parameters
  	1. sl,	0
 
-#610. 4 ncsl lines
+#612. 4 ncsl lines
 	7,dial.thread.c:516,523
 	9,netssh.c:2220,2224
 	1 parameters
  	1. sl,	0
 
-#611. 4 ncsl lines
-	9,netssh.c:2220,2224
-	13,sshsession.c:151,155
-	0 parameters
-
-#612. 4 ncsl lines
-	9,netssh.c:2434,2438
-	13,sshsession.c:151,155
-	0 parameters
-
 #613. 4 ncsl lines
 	0,cipher3des.c:27,31
 	9,netssh.c:2220,2224

sys/src/cmd/ssh2/dup.sum

@@ -2,12 +2,12 @@
 Summary:
 Reporting parameterized matches of at least 3 lines.
 15 files
-7219 lines in original code,
-6258 lines after pruning white space and comments.
+7218 lines in original code,
+6257 lines after pruning white space and comments.
 
-2197 lines were involved in 614 matches
-These constitute 35 percent of the ncsl.
-Approximately 1388 lines are redundant,or 22 percent of the ncsl.
+2243 lines were involved in 614 matches
+These constitute 36 percent of the ncsl.
+Approximately 1412 lines are redundant,or 23 percent of the ncsl.
 
 match length: number of matches of that length
 	   3: 262

sys/src/cmd/ssh2/dup.xpr

@@ -18,9 +18,9 @@ percent of file involved, #lines in file involved; file2,filename2
       28, 11; 3,cipherrc4.c:
       28, 11; 3,cipherrc4.c:
 
-18, 150, 60; 5,5
-      29, 240; 5,dh.c:
-      29, 240; 5,dh.c:
+19, 152, 60; 5,5
+      30, 244; 5,dh.c:
+      30, 244; 5,dh.c:
 
 7, 28, 9; 6,6
       13, 56; 6,dial.c:
@@ -66,9 +66,9 @@ percent of file involved, #lines in file involved; file2,filename2
       2, 15; 5,dh.c:
       2, 9; 6,dial.c:
 
-30, 257, 33; 6,7
-      59, 252; 6,dial.c:
-      57, 244; 7,dial.thread.c:
+33, 279, 33; 6,7
+      64, 273; 6,dial.c:
+      62, 265; 7,dial.thread.c:
 
 0, 10, 3; 8,9
       40, 6; 8,esmprint.c:

sys/src/cmd/ssh2/long.funcs

@@ -9,7 +9,7 @@
 98	sshsession.c:187,285	main()
 98	dh.c:462,560	dh_server()
 98	netssh.c:1909,2007	dohandshake()
-97	ssh.c:477,574	main()
+97	ssh.c:476,573	main()
 96	dh.c:685,781	dh_client12()
 95	netssh.c:2596,2691	validatekexs()
 94	dh.c:821,915	genkeys()
@@ -34,11 +34,11 @@
 62	pubkey.c:142,204	replacekey()
 58	netssh.c:2873,2931	authreqpk()
 53	sshsession.c:449,502	runcmd()
-51	ssh.c:345,396	bidircopy()
+51	ssh.c:344,395	bidircopy()
 50	dh.c:256,306	rsa_sign()
 50	dh.c:631,681	verifyhostkey()
 50	netssh.c:168,218	threadmain()
-49	ssh.c:288,337	keyproc()
+48	ssh.c:288,336	keyproc()
 48	pubkey.c:17,65	parsepubkey()
 47	netssh.c:886,933	readdata()
 45	netssh.c:937,982	stwrite()
@@ -59,7 +59,7 @@
 32	dial.thread.c:243,275	recvresults()
 31	netssh.c:1782,1813	exchids()
 30	dial.thread.c:284,314	dialmulti()
-30	ssh.c:588,618	doauth()
+30	ssh.c:587,617	doauth()
 30	dial.c:300,330	dialmulti()
 30	netssh.c:2791,2821	mkcap()
 30	ssh.c:86,116	parseargs()
@@ -72,7 +72,7 @@
 27	netssh.c:1846,1873	deferredinit()
 27	netssh.c:1877,1904	dohandshake()
 26	sshsession.c:157,183	listenloop()
-26	ssh.c:447,473	remotecmd()
+26	ssh.c:446,472	remotecmd()
 26	sshsession.c:127,153	authnewns()
 26	pubkey.c:112,138	findkey()
 25	sshsession.c:420,445	confine()

sys/src/cmd/ssh2/magic.out

@@ -245,15 +245,15 @@ ssh.c:270: n = readn(keyfd, buf+5, n);
 ssh.c:273: buf[n+5] = 0;
 ssh.c:278: fprint(kconsfd, "%s\n", buf+5);
 ssh.c:292: if (size < 6)
-ssh.c:307: n = read(keyfd, buf, 5);		/* reading /net/ssh/keys */
-ssh.c:310: buf[5] = 0;
-ssh.c:311: n = strtol(buf+1, nil, 10);
-ssh.c:312: n = readn(keyfd, buf+5, n);
-ssh.c:313: buf[n+5] = 0;
-ssh.c:319: fprint(kconsfd, "%s\n", buf+5);
-ssh.c:405: ds = netmkaddr(remote, dir, "22");		/* tcp port 22 is ssh */
-ssh.c:579: char buf[64];
-ssh.c:583: return strlen(buf) >= 9 && strcmp(buf+strlen(buf)-9, "/dev/cons") == 0;
+ssh.c:306: n = read(keyfd, buf, 5);		/* reading /net/ssh/keys */
+ssh.c:309: buf[5] = 0;
+ssh.c:310: n = strtol(buf+1, nil, 10);
+ssh.c:311: n = readn(keyfd, buf+5, n);
+ssh.c:312: buf[n < 0? 5: n+5] = 0;
+ssh.c:318: fprint(kconsfd, "%s\n", buf+5);
+ssh.c:404: ds = netmkaddr(remote, dir, "22");		/* tcp port 22 is ssh */
+ssh.c:578: char buf[64];
+ssh.c:582: return strlen(buf) >= 9 && strcmp(buf+strlen(buf)-9, "/dev/cons") == 0;
 sshsession.c:228: errfd = 2;
 sshsession.c:411: q += 4;
 sshsession.c:425: q += 4;