History

20070608-1149

Charles.Forsyth committed 19 years ago

Commit 2da3ec41 parent 24a543914 files · +34 −15Browse files

Unified · Split

14 files
  1. CHANGES +2 −0
  2. appl/cmd/9export.b +0 −1
  3. appl/cmd/install/logs.b +1 −1
  4. dis/9export.dis +0 −0
  5. dis/install/logs.dis +0 −0
  6. include/version.h +1 −1
  7. lib9/fmtdef.h +4 −0
  8. lib9/fmtprint.c +4 −2
  9. lib9/fmtvprint.c +6 −3
  10. lib9/runevseprint.c +2 −1
  11. lib9/vfprint.c +2 −1
  12. lib9/vseprint.c +2 −1
  13. lib9/vsmprint.c +10 −5
  14. lib9/vsnprint.c +2 −1
CHANGES+2−0
@@ -1,3 +1,5 @@
120070608
2 update /lib9 functions to use silly va_copy (and then va_end) instead of just assigning, to account for silly C implementations
120070607320070607
2 /appl/wm/man.b /appl/lib/man.b to allow 10.1 etc as section references4 /appl/wm/man.b /appl/lib/man.b to allow 10.1 etc as section references
320070605520070605
appl/cmd/9export.b+0−1
@@ -38,7 +38,6 @@ init(nil: ref Draw->Context, args: list of string) · 37 unmodified lines
38 38
39 arg->init(args);39 arg->init(args);
40 arg->setusage("9export [-aA9] [-k keyspec] [-e enc digest]");40 arg->setusage("9export [-aA9] [-k keyspec] [-e enc digest]");
41 flags := 0;
42 cryptalg := ""; # will be rc4_256 sha141 cryptalg := ""; # will be rc4_256 sha1
43 keyspec := "";42 keyspec := "";
44 noauth := 0;43 noauth := 0;
appl/cmd/install/logs.b+1−1
@@ -122,7 +122,7 @@ contents(e: ref Entry): string · 121 unmodified lines
122 s := "";122 s := "";
123 for(cl := e.contents; cl != nil; cl = tl cl)123 for(cl := e.contents; cl != nil; cl = tl cl)
124 s += " " + hd cl;124 s += " " + hd cl;
125 return s[1:];125 return s; # includes initial space
126}126}
127 127
128Entry.text(e: self ref Entry): string128Entry.text(e: self ref Entry): string
dis/9export.dis+0−0

Binary file not shown.

dis/install/logs.dis+0−0

Binary file not shown.

include/version.h+1−1
@@ -1 +1 @@
1#define VERSION "Fourth Edition (20070607)"1#define VERSION "Fourth Edition (20070608)"
lib9/fmtdef.h+4−0
@@ -96,3 +96,7 @@ void _fmtunlock(void); · 95 unmodified lines
96 t += runetochar(t, &_rune);\96 t += runetochar(t, &_rune);\
97 }\97 }\
98 }while(0)98 }while(0)
99
100#ifndef va_copy
101#define va_copy(a, b) ((a) = (b))
102#endif
lib9/fmtprint.c+4−2
@@ -29,14 +29,16 @@ fmtprint(Fmt *f, char *fmt, ...) · 28 unmodified lines
29 f->flags = 0;29 f->flags = 0;
30 f->width = 0;30 f->width = 0;
31 f->prec = 0;31 f->prec = 0;
32 va = f->args;32 va_copy(va, f->args);
33 va_end(f->args);
33 va_start(f->args, fmt);34 va_start(f->args, fmt);
34 n = dofmt(f, fmt);35 n = dofmt(f, fmt);
35 va_end(f->args);36 va_end(f->args);
36 f->flags = 0;37 f->flags = 0;
37 f->width = 0;38 f->width = 0;
38 f->prec = 0;39 f->prec = 0;
39 f->args = va;40 va_copy(f->args, va);
41 va_end(va);
40 if(n >= 0)42 if(n >= 0)
41 return 0;43 return 0;
42 return n;44 return n;
lib9/fmtvprint.c+6−3
@@ -29,13 +29,16 @@ fmtvprint(Fmt *f, char *fmt, va_list args) · 28 unmodified lines
29 f->flags = 0;29 f->flags = 0;
30 f->width = 0;30 f->width = 0;
31 f->prec = 0;31 f->prec = 0;
32 va = f->args;32 va_copy(va, f->args);
33 f->args = args;33 va_end(f->args);
34 va_copy(f->args, args);
34 n = dofmt(f, fmt);35 n = dofmt(f, fmt);
35 f->flags = 0;36 f->flags = 0;
36 f->width = 0;37 f->width = 0;
37 f->prec = 0;38 f->prec = 0;
38 f->args = va;39 va_end(f->args);
40 va_copy(f->args, va);
41 va_end(va);
39 if(n >= 0)42 if(n >= 0)
40 return 0;43 return 0;
41 return n;44 return n;
lib9/runevseprint.c+2−1
@@ -14,8 +14,9 @@ runevseprint(Rune *buf, Rune *e, char *fmt, va_list args) · 13 unmodified lines
14 f.flush = nil;14 f.flush = nil;
15 f.farg = nil;15 f.farg = nil;
16 f.nfmt = 0;16 f.nfmt = 0;
17 f.args = args;17 va_copy(f.args, args);
18 dofmt(&f, fmt);18 dofmt(&f, fmt);
19 va_end(f.args);
19 *(Rune*)f.to = '\0';20 *(Rune*)f.to = '\0';
20 return f.to;21 return f.to;
21}22}
lib9/vfprint.c+2−1
@@ -38,8 +38,9 @@ vfprint(int fd, char *fmt, va_list args) · 37 unmodified lines
38 int n;38 int n;
39 39
40 fmtfdinit(&f, fd, buf, sizeof(buf));40 fmtfdinit(&f, fd, buf, sizeof(buf));
41 f.args = args;41 va_copy(f.args, args);
42 n = dofmt(&f, fmt);42 n = dofmt(&f, fmt);
43 va_end(f.args);
43 if(n > 0 && _fmtFdFlush(&f) == 0)44 if(n > 0 && _fmtFdFlush(&f) == 0)
44 return -1;45 return -1;
45 return n;46 return n;
lib9/vseprint.c+2−1
@@ -27,8 +27,9 @@ vseprint(char *buf, char *e, char *fmt, va_list args) · 26 unmodified lines
27 f.flush = nil;27 f.flush = nil;
28 f.farg = nil;28 f.farg = nil;
29 f.nfmt = 0;29 f.nfmt = 0;
30 f.args = args;30 va_copy(f.args, args);
31 dofmt(&f, fmt);31 dofmt(&f, fmt);
32 va_end(f.args);
32 *(char*)f.to = '\0';33 *(char*)f.to = '\0';
33 return f.to;34 return f.to;
34}35}
lib9/vsmprint.c+10−5
@@ -20,6 +20,8 @@ fmtStrFlush(Fmt *f) · 19 unmodified lines
20 char *s;20 char *s;
21 int n;21 int n;
22 22
23 if(f->start == nil)
24 return 0;
23 n = (int)f->farg;25 n = (int)f->farg;
24 n += 256;26 n += 256;
25 f->farg = (void*)n;27 f->farg = (void*)n;
@@ -41,7 +43,7 @@ fmtstrinit(Fmt *f) · 15 unmodified lines
41{43{
42 int n;44 int n;
43 45
44 f->runes = 0;46 memset(f, 0, sizeof(*f));
45 n = 32;47 n = 32;
46 f->start = malloc(n);48 f->start = malloc(n);
47 if(f->start == nil)49 if(f->start == nil)
@@ -65,10 +67,13 @@ vsmprint(char *fmt, va_list args) · 17 unmodified lines
65 67
66 if(fmtstrinit(&f) < 0)68 if(fmtstrinit(&f) < 0)
67 return nil;69 return nil;
68 f.args = args;70 va_copy(f.args, args);
69 n = dofmt(&f, fmt);71 n = dofmt(&f, fmt);
70 if(n < 0)72 va_end(f.args);
73 if(n < 0){
74 free(f.start);
75 f.start = nil;
71 return nil;76 return nil;
72 *(char*)f.to = '\0';77 }
73 return f.start;78 return fmtstrflush(&f);
74}79}
lib9/vsnprint.c+2−1
@@ -27,8 +27,9 @@ vsnprint(char *buf, int len, char *fmt, va_list args) · 26 unmodified lines
27 f.flush = nil;27 f.flush = nil;
28 f.farg = nil;28 f.farg = nil;
29 f.nfmt = 0;29 f.nfmt = 0;
30 f.args = args;30 va_copy(f.args, args);
31 dofmt(&f, fmt);31 dofmt(&f, fmt);
32 va_end(f.args);
32 *(char*)f.to = '\0';33 *(char*)f.to = '\0';
33 return (char*)f.to - buf;34 return (char*)f.to - buf;
34}35}

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t