Merge pull request #536 from ertugerata/master

bc rebuild
This commit is contained in:
Ertuğrul Erata
2017-01-27 13:40:24 +02:00
committed by GitHub
3 changed files with 60 additions and 0 deletions
@@ -0,0 +1,24 @@
diff -up wrk/doc/bc.1.wrk wrk/doc/bc.1
--- wrk/doc/bc.1.wrk 2013-10-02 13:36:52.066295450 +0200
+++ wrk/doc/bc.1 2013-10-02 13:35:22.738553712 +0200
@@ -174,6 +174,8 @@ The result of the expression is the sum
The result of the expression is the difference of the two expressions.
.IP "expr * expr"
The result of the expression is the product of the two expressions.
+If a and b are the scales of the two expressions, then the scale of the result is:
+min(a+b,max(scale,a,b))
.IP "expr / expr"
The result of the expression is the quotient of the two expressions.
The scale of the result is the value of the variable \fBscale\fR.
diff -up wrk/doc/bc.texi.wrk wrk/doc/bc.texi
--- wrk/doc/bc.texi.wrk 2013-10-02 13:17:01.743765518 +0200
+++ wrk/doc/bc.texi 2013-10-02 13:21:04.479870656 +0200
@@ -290,6 +290,8 @@ The result of the expression is the diff
@item expr * expr
The result of the expression is the product of the two expressions.
+If a and b are the scales of the two expressions, then the scale of the result is:
+min(a+b,max(@var{scale},a,b))
@item expr / expr
The result of the expression is the quotient of the two expressions.
@@ -0,0 +1,27 @@
Binary files bc-1.06.95-orig/dc/.dc.c.swp and bc-1.06.95/dc/.dc.c.swp differ
diff -urNp bc-1.06.95-orig/dc/eval.c bc-1.06.95/dc/eval.c
--- bc-1.06.95-orig/dc/eval.c 2006-06-04 13:04:40.000000000 +0200
+++ bc-1.06.95/dc/eval.c 2011-09-08 15:11:48.815060585 +0200
@@ -661,7 +661,9 @@ dc_evalfile DC_DECLARG((fp))
int next_negcmp = 0;
dc_data datum;
- signal(SIGINT, dc_trap_interrupt);
+ /* Do not mask SIGINT when running from stdin */
+ if (fp != stdin)
+ signal(SIGINT, dc_trap_interrupt);
stdin_lookahead = EOF;
for (c=getc(fp); c!=EOF; c=peekc){
peekc = getc(fp);
diff -urNp bc-1.06.95-orig/doc/dc.texi bc-1.06.95/doc/dc.texi
--- bc-1.06.95-orig/doc/dc.texi 2006-06-11 10:15:54.000000000 +0200
+++ bc-1.06.95/doc/dc.texi 2011-09-08 15:09:37.032059798 +0200
@@ -126,6 +126,8 @@ To exit, use @samp{q}.
(or whatever other keystroke your system uses to generate a @code{SIGINT})
does not exit;
it is used to abort macros that are looping, etc.
+This is not true if running on stdin to prevent accidental user confusion
+about @kbd{C-c} unfunctionality.
A reverse-polish calculator stores numbers on a stack.
Entering a number pushes it on the stack.
+9
View File
@@ -22,6 +22,8 @@
<Patch level="1">fedora/bc-1.06.95-memleak.patch</Patch>
<Patch level="1">fedora/bc-1.06-dc_ibase.patch</Patch>
<Patch level="1">fedora/bc-1.06.95-matlib.patch</Patch>
<Patch level="1">fedora/bc-1.06.95-sigintmasking.patch</Patch>
<Patch level="1">fedora/bc-1.06.95-doc.patch</Patch>
</Patches>
</Source>
@@ -39,6 +41,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-01-27</Date>
<Version>1.06.95</Version>
<Comment>Release Bump</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-27</Date>
<Version>1.06.95</Version>