Re: [PATCH] usr.bin/sdiff/sdiff.c prompt bikeshedding

2014-04-23 Thread Kent R. Spillner 
Moar bikeshedding:


Index: sdiff.c
===
RCS file: /work/cvsroot/src/usr.bin/sdiff/sdiff.c,v
retrieving revision 1.30
diff -p -u -r1.30 sdiff.c
--- sdiff.c 26 Nov 2013 21:08:12 -  1.30
+++ sdiff.c 23 Apr 2014 17:58:07 -
@@ -419,8 +419,8 @@ prompt(const char *s1, const char *s2)
 {
char *cmd;
 
-   /* Print command prompt. */
-   putchar('%');
+#define PROMPT_STR "%% "
+   printf(PROMPT_STR);
 
/* Get user input. */
for (; (cmd = xfgets(stdin)); free(cmd)) {
@@ -473,7 +473,7 @@ prompt(const char *s1, const char *s2)
 USAGE:
int_usage();
 PROMPT:
-   putchar('%');
+   printf(PROMPT_STR);
 
/* Prompt user again. */
continue;

Re: [PATCH] usr.bin/sdiff/sdiff.c prompt bikeshedding

2014-04-22 Thread Kent R. Spillner 
Ok, this time with more mutt:

Index: usr.bin/sdiff//sdiff.c
===
RCS file: /work/cvsroot/src/usr.bin/sdiff/sdiff.c,v
retrieving revision 1.30
diff -p -u -r1.30 sdiff.c
--- usr.bin/sdiff//sdiff.c  26 Nov 2013 21:08:12 -  1.30
+++ usr.bin/sdiff//sdiff.c  22 Apr 2014 18:27:38 -
@@ -421,6 +421,7 @@ prompt(const char *s1, const char *s2)
 
/* Print command prompt. */
putchar('%');
+   putchar(' ');
 
/* Get user input. */
for (; (cmd = xfgets(stdin)); free(cmd)) {
@@ -474,6 +475,7 @@ USAGE:
int_usage();
 PROMPT:
putchar('%');
+   putchar(' ');
 
/* Prompt user again. */
continue;


On Tue, Apr 22, 2014 at 01:33:48PM -0500, Kent R. Spillner wrote:
> Sorry, my webmail client ate the whitespace.  mutt is a casualty of the
> Valhalla rampage (whines about permissions on /dev/arandom) and kerberosV
> removal.  I'll rebuild mutt from ports and resubmit.
> 
> 
> -Original Message-
> From: "Kent R. Spillner" 
> Sent: Tuesday, April 22, 2014 13:29
> To: tech@openbsd.org
> Subject: [PATCH] usr.bin/sdiff/sdiff.c prompt bikeshedding
> 
> Personally, when sysmerge asks if I'd like to merge something I'd
> prefer a little breathing room at the prompt.  (Will this break
> anything?)
> 
> 
> Index: usr.bin/sdiff//sdiff.c
> ===
> RCS file: /work/cvsroot/src/usr.bin/sdiff/sdiff.c,v
> retrieving revision 1.30
> diff -p -u -r1.30 sdiff.c
> --- usr.bin/sdiff//sdiff.c  26 Nov 2013 21:08:12 -  1.30
> +++ usr.bin/sdiff//sdiff.c  22 Apr 2014 18:27:38 -
> @@ -421,6 +421,7 @@ prompt(const char *s1, const char *s2)
>  
> /* Print command prompt. */
> putchar('%');
> +   putchar(' ');
>  
> /* Get user input. */
> for (; (cmd = xfgets(stdin)); free(cmd)) {
> @@ -474,6 +475,7 @@ USAGE:
> int_usage();
>  PROMPT:
> putchar('%');
> +   putchar(' ');
>  
> /* Prompt user again. */
> continue;
> 
> 
> 
> 
> 
>

Re: [PATCH] usr.bin/sdiff/sdiff.c prompt bikeshedding

2014-04-22 Thread Kent R. Spillner 
Sorry, my webmail client ate the whitespace.  mutt is a casualty of the
Valhalla rampage (whines about permissions on /dev/arandom) and kerberosV
removal.  I'll rebuild mutt from ports and resubmit.


-Original Message-
From: "Kent R. Spillner" 
Sent: Tuesday, April 22, 2014 13:29
To: tech@openbsd.org
Subject: [PATCH] usr.bin/sdiff/sdiff.c prompt bikeshedding

Personally, when sysmerge asks if I'd like to merge something I'd
prefer a little breathing room at the prompt.  (Will this break
anything?)


Index: usr.bin/sdiff//sdiff.c
===
RCS file: /work/cvsroot/src/usr.bin/sdiff/sdiff.c,v
retrieving revision 1.30
diff -p -u -r1.30 sdiff.c
--- usr.bin/sdiff//sdiff.c  26 Nov 2013 21:08:12 -  1.30
+++ usr.bin/sdiff//sdiff.c  22 Apr 2014 18:27:38 -
@@ -421,6 +421,7 @@ prompt(const char *s1, const char *s2)
 
/* Print command prompt. */
putchar('%');
+   putchar(' ');
 
/* Get user input. */
for (; (cmd = xfgets(stdin)); free(cmd)) {
@@ -474,6 +475,7 @@ USAGE:
int_usage();
 PROMPT:
putchar('%');
+   putchar(' ');
 
/* Prompt user again. */
continue;

[PATCH] usr.bin/sdiff/sdiff.c prompt bikeshedding

2014-04-22 Thread Kent R. Spillner 
Personally, when sysmerge asks if I'd like to merge something I'd
prefer a little breathing room at the prompt.  (Will this break
anything?)


Index: usr.bin/sdiff//sdiff.c
===
RCS file: /work/cvsroot/src/usr.bin/sdiff/sdiff.c,v
retrieving revision 1.30
diff -p -u -r1.30 sdiff.c
--- usr.bin/sdiff//sdiff.c  26 Nov 2013 21:08:12 -  1.30
+++ usr.bin/sdiff//sdiff.c  22 Apr 2014 18:27:38 -
@@ -421,6 +421,7 @@ prompt(const char *s1, const char *s2)
 
/* Print command prompt. */
putchar('%');
+   putchar(' ');
 
/* Get user input. */
for (; (cmd = xfgets(stdin)); free(cmd)) {
@@ -474,6 +475,7 @@ USAGE:
int_usage();
 PROMPT:
putchar('%');
+   putchar(' ');
 
/* Prompt user again. */
continue;