History

20090409-1230

Charles.Forsyth committed 17 years ago

Commit 391d9031 parent 2b5b5de2 files · +15 −9Browse files

Unified · Split

2 files
  1. CHANGES +5 −0
  2. tools/odbc/odbc.c +10 −9
CHANGES+5−0
@@ -1,6 +1,11 @@
1+20090409
2+ tools/odbc/odbc.c data read should return 0 if no columns or rows (issue 170)
3+20090408
4+ tools/odbc/odbc.c use strecpy and more care in allocation (issue 169)
15 20090403
26 change ,2 to ,#function in Solaris sparc assembler files (apparently works in gcc and sun's)
37 make appl/wm/brutus.b pass input to its widgets (issue 105)
8+ enable fullscreen mode in MacOSX (issue 148)
49 20090402
510 add missing emu/Linux/segflush-*.c files and remove ARM segflush from os.c
611 20090402
tools/odbc/odbc.c+10−9
@@ -210,7 +210,8 @@ odbcerror(Conv *cv, int lasterr) · 209 unmodified lines
210210 return cv->errmsg;
211211 }
212212
213−char *odbcsources(Client *c)
213+char*
214+odbcsources(Client *c)
214215 {
215216 int ss, i;
216217 char server[SQL_MAX_DSN_LENGTH+1];
@@ -225,7 +226,7 @@ char *odbcsources(Client *c) · 8 unmodified lines
225226 source, sizeof(source), &sourcelen);
226227 if (ss != SQL_SUCCESS)
227228 break;
228− sprint(buff, "%s:%s\n", server, source);
229+ snprint(buff, sizeof(buff), "%s:%s\n", server, source);
229230 if (i == 0)
230231 all = strdup(buff);
231232 else {
@@ -248,7 +249,7 @@ sqlerr(Conv *c, int sqlstatus, char *errp, char *func, char *sqlcall) · 16 unmodified lines
248249 errp[0] = 0;
249250 e = "failed";
250251 if (sqlstatus == SQL_ERROR || sqlstatus == SQL_SUCCESS_WITH_INFO)
251− strcat(errp, odbcerror(c, 0));
252+ strecpy(errp, errp+ERRMAX, odbcerror(c, 0));
252253 if (sqlstatus == SQL_SUCCESS_WITH_INFO)
253254 e = "info";
254255 if (sqlstatus != SQL_SUCCESS)
@@ -525,7 +526,7 @@ odbcdataread(Conv *c, void *a, long n, ulong offset, char *ename) · 270 unmodified lines
525526 return -1;
526527 }
527528 if (s->cols == 0 || s->rec == 0)
528− return -1;
529+ return 0;
529530 p = a;
530531 left = n;
531532 if (c->headings) {
@@ -609,7 +610,7 @@ odbcfmtread(Conv *c, void *a, long n, ulong offset, char *ename) · 77 unmodified lines
609610 for(i=0; i<s->ncols; i++){
610611 Coltype *t = &s->cols[i];
611612
612− len = sprint(buf, "%ld %ld %s\n", off, off+t->size, t->name);
613+ len = snprint(buf, sizeof(buf), "%ld %ld %s\n", off, off+t->size, t->name);
613614 off += t->size;
614615 if(left < len)
615616 break;
@@ -788,7 +789,7 @@ protoclone(Proto *p, char *user) · 172 unmodified lines
788789 c->errmsg[0] = 0;
789790
790791 nr = QID(0, c->x, Qconvdir);
791− sprint(buf, "%d", c->x);
792+ snprint(buf, sizeof(buf), "%d", c->x);
792793 styxadddir(iserver, Qprotodir, nr, buf, 0555, c->owner);
793794 styxaddfile(iserver, nr, QID(0, c->x, Qcmd), "cmd", c->perm, c->owner);
794795 styxaddfile(iserver, nr, QID(0, c->x, Qctl), "ctl", c->perm, c->owner);
@@ -904,7 +905,7 @@ dbclose(Qid qid, int mode) · 109 unmodified lines
904905 return nil;
905906 }
906907
907−static char ebuf[128];
908+static char ebuf[ERRMAX];
908909
909910 char*
910911 dbread(Qid qid, char *ba, ulong *n, vlong offset)
@@ -931,7 +932,7 @@ dbread(Qid qid, char *ba, ulong *n, vlong offset) · 20 unmodified lines
931932 case Qconvdir:
932933 return "bad read of directory";
933934 case Qctl:
934− sprint(buf, "%ld", CONV(qid));
935+ snprint(buf, sizeof(buf), "%ld", CONV(qid));
935936 *n = readstr(offset, p, m, buf);
936937 return nil;
937938 case Qstatus:
@@ -1093,7 +1094,7 @@ dbwrite(Qid qid, char *ba, ulong *n, vlong offset) · 155 unmodified lines
10931094 }
10941095
10951096 void
1096−badusage()
1097+badusage(void)
10971098 {
10981099 fprint(2, "Usage: odbc [-d] [-p port]\n");
10991100 exit(1);

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