rc: update to 1.7.4.
This commit is contained in:
parent
87dff1e8ce
commit
aef5424066
2 changed files with 4 additions and 65 deletions
|
@ -1,61 +0,0 @@
|
||||||
--- print.c
|
|
||||||
+++ print.c
|
|
||||||
@@ -285,11 +285,11 @@ extern int fmtprint(Format *format, const char *fmt,...) {
|
|
||||||
va_list ap, saveargs;
|
|
||||||
|
|
||||||
va_start(ap, fmt);
|
|
||||||
- __va_copy(saveargs, format->args);
|
|
||||||
- __va_copy(format->args, ap);
|
|
||||||
+ va_copy(saveargs, format->args);
|
|
||||||
+ va_copy(format->args, ap);
|
|
||||||
n += printfmt(format, fmt);
|
|
||||||
va_end(format->args);
|
|
||||||
- __va_copy(format->args, saveargs);
|
|
||||||
+ va_copy(format->args, saveargs);
|
|
||||||
|
|
||||||
return n + format->flushed;
|
|
||||||
}
|
|
||||||
@@ -316,7 +316,7 @@ extern int fprint(int fd, const char *fmt,...) {
|
|
||||||
format.u.n = fd;
|
|
||||||
|
|
||||||
va_start(ap, fmt);
|
|
||||||
- __va_copy(format.args, ap);
|
|
||||||
+ va_copy(format.args, ap);
|
|
||||||
printfmt(&format, fmt);
|
|
||||||
va_end(format.args);
|
|
||||||
|
|
||||||
@@ -361,7 +361,7 @@ extern char *mprint(const char *fmt,...) {
|
|
||||||
|
|
||||||
format.u.n = 1;
|
|
||||||
va_start(ap, fmt);
|
|
||||||
- __va_copy(format.args, ap);
|
|
||||||
+ va_copy(format.args, ap);
|
|
||||||
result = memprint(&format, fmt, ealloc(PRINT_ALLOCSIZE), PRINT_ALLOCSIZE);
|
|
||||||
va_end(format.args);
|
|
||||||
return result;
|
|
||||||
@@ -374,7 +374,7 @@ extern char *nprint(const char *fmt,...) {
|
|
||||||
|
|
||||||
format.u.n = 0;
|
|
||||||
va_start(ap, fmt);
|
|
||||||
- __va_copy(format.args, ap);
|
|
||||||
+ va_copy(format.args, ap);
|
|
||||||
result = memprint(&format, fmt, nalloc(PRINT_ALLOCSIZE), PRINT_ALLOCSIZE);
|
|
||||||
va_end(format.args);
|
|
||||||
return result;
|
|
||||||
--- proto.h
|
|
||||||
+++ proto.h
|
|
||||||
@@ -23,11 +23,11 @@ typedef long align_t;
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
-/* C 9x specifies a __va_copy() macro which should be used for copying
|
|
||||||
+/* C 9x specifies a va_copy() macro which should be used for copying
|
|
||||||
objects of type va_list. Of course, most places don't have this yet,
|
|
||||||
but where it does exist we need to use it. */
|
|
||||||
-#ifndef __va_copy
|
|
||||||
-#define __va_copy(x,y) (x)=(y)
|
|
||||||
+#ifndef va_copy
|
|
||||||
+#define va_copy(x,y) (x)=(y)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if STDC_HEADERS
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'rc'
|
# Template file for 'rc'
|
||||||
pkgname=rc
|
pkgname=rc
|
||||||
version=1.7.2
|
version=1.7.4
|
||||||
revision=2
|
revision=1
|
||||||
build_pie=1
|
build_pie=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="ac_cv_sys_restartable_syscalls=no
|
configure_args="ac_cv_sys_restartable_syscalls=no
|
||||||
|
@ -12,10 +12,10 @@ makedepends="$(vopt_if readline readline-devel)
|
||||||
register_shell="/bin/rc"
|
register_shell="/bin/rc"
|
||||||
short_desc="An alternative implementation of the plan 9 rc shell"
|
short_desc="An alternative implementation of the plan 9 rc shell"
|
||||||
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
|
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
|
||||||
license="custom"
|
license="zlib"
|
||||||
homepage="http://tobold.org/article/rc"
|
homepage="http://tobold.org/article/rc"
|
||||||
distfiles="http://static.tobold.org/$pkgname/$pkgname-$version.tar.gz"
|
distfiles="http://static.tobold.org/$pkgname/$pkgname-$version.tar.gz"
|
||||||
checksum=04e762d15cccb3c3191a0f40e5158f176a21707f89cb9e0b04c8085ea7246be5
|
checksum=5ed26334dd0c1a616248b15ad7c90ca678ae3066fa02c5ddd0e6936f9af9bfd8
|
||||||
|
|
||||||
build_options="readline libedit static"
|
build_options="readline libedit static"
|
||||||
build_options_default="readline"
|
build_options_default="readline"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue