| @@ -210,7 +210,8 @@ odbcerror(Conv *cv, int lasterr) · 209 unmodified lines |
| 210 | return cv->errmsg; | 210 | return cv->errmsg; |
| 211 | } | 211 | } |
| 212 | | 212 | |
| 213 | char *odbcsources(Client *c) | 213 | char* |
| | 214 | odbcsources(Client *c) |
| 214 | { | 215 | { |
| 215 | int ss, i; | 216 | int ss, i; |
| 216 | char server[SQL_MAX_DSN_LENGTH+1]; | 217 | char server[SQL_MAX_DSN_LENGTH+1]; |
| @@ -225,7 +226,7 @@ char *odbcsources(Client *c) · 8 unmodified lines |
| 225 | source, sizeof(source), &sourcelen); | 226 | source, sizeof(source), &sourcelen); |
| 226 | if (ss != SQL_SUCCESS) | 227 | if (ss != SQL_SUCCESS) |
| 227 | break; | 228 | break; |
| 228 | sprint(buff, "%s:%s\n", server, source); | 229 | snprint(buff, sizeof(buff), "%s:%s\n", server, source); |
| 229 | if (i == 0) | 230 | if (i == 0) |
| 230 | all = strdup(buff); | 231 | all = strdup(buff); |
| 231 | else { | 232 | else { |
| @@ -248,7 +249,7 @@ sqlerr(Conv *c, int sqlstatus, char *errp, char *func, char *sqlcall) · 16 unmodified lines |
| 248 | errp[0] = 0; | 249 | errp[0] = 0; |
| 249 | e = "failed"; | 250 | e = "failed"; |
| 250 | if (sqlstatus == SQL_ERROR || sqlstatus == SQL_SUCCESS_WITH_INFO) | 251 | if (sqlstatus == SQL_ERROR || sqlstatus == SQL_SUCCESS_WITH_INFO) |
| 251 | strcat(errp, odbcerror(c, 0)); | 252 | strecpy(errp, errp+ERRMAX, odbcerror(c, 0)); |
| 252 | if (sqlstatus == SQL_SUCCESS_WITH_INFO) | 253 | if (sqlstatus == SQL_SUCCESS_WITH_INFO) |
| 253 | e = "info"; | 254 | e = "info"; |
| 254 | if (sqlstatus != SQL_SUCCESS) | 255 | if (sqlstatus != SQL_SUCCESS) |
| @@ -525,7 +526,7 @@ odbcdataread(Conv *c, void *a, long n, ulong offset, char *ename) · 270 unmodified lines |
| 525 | return -1; | 526 | return -1; |
| 526 | } | 527 | } |
| 527 | if (s->cols == 0 || s->rec == 0) | 528 | if (s->cols == 0 || s->rec == 0) |
| 528 | return -1; | 529 | return 0; |
| 529 | p = a; | 530 | p = a; |
| 530 | left = n; | 531 | left = n; |
| 531 | if (c->headings) { | 532 | if (c->headings) { |
| @@ -609,7 +610,7 @@ odbcfmtread(Conv *c, void *a, long n, ulong offset, char *ename) · 77 unmodified lines |
| 609 | for(i=0; i<s->ncols; i++){ | 610 | for(i=0; i<s->ncols; i++){ |
| 610 | Coltype *t = &s->cols[i]; | 611 | Coltype *t = &s->cols[i]; |
| 611 | | 612 | |
| 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); |
| 613 | off += t->size; | 614 | off += t->size; |
| 614 | if(left < len) | 615 | if(left < len) |
| 615 | break; | 616 | break; |
| @@ -788,7 +789,7 @@ protoclone(Proto *p, char *user) · 172 unmodified lines |
| 788 | c->errmsg[0] = 0; | 789 | c->errmsg[0] = 0; |
| 789 | | 790 | |
| 790 | nr = QID(0, c->x, Qconvdir); | 791 | nr = QID(0, c->x, Qconvdir); |
| 791 | sprint(buf, "%d", c->x); | 792 | snprint(buf, sizeof(buf), "%d", c->x); |
| 792 | styxadddir(iserver, Qprotodir, nr, buf, 0555, c->owner); | 793 | styxadddir(iserver, Qprotodir, nr, buf, 0555, c->owner); |
| 793 | styxaddfile(iserver, nr, QID(0, c->x, Qcmd), "cmd", c->perm, c->owner); | 794 | styxaddfile(iserver, nr, QID(0, c->x, Qcmd), "cmd", c->perm, c->owner); |
| 794 | styxaddfile(iserver, nr, QID(0, c->x, Qctl), "ctl", c->perm, c->owner); | 795 | 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 |
| 904 | return nil; | 905 | return nil; |
| 905 | } | 906 | } |
| 906 | | 907 | |
| 907 | static char ebuf[128]; | 908 | static char ebuf[ERRMAX]; |
| 908 | | 909 | |
| 909 | char* | 910 | char* |
| 910 | dbread(Qid qid, char *ba, ulong *n, vlong offset) | 911 | 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 |
| 931 | case Qconvdir: | 932 | case Qconvdir: |
| 932 | return "bad read of directory"; | 933 | return "bad read of directory"; |
| 933 | case Qctl: | 934 | case Qctl: |
| 934 | sprint(buf, "%ld", CONV(qid)); | 935 | snprint(buf, sizeof(buf), "%ld", CONV(qid)); |
| 935 | *n = readstr(offset, p, m, buf); | 936 | *n = readstr(offset, p, m, buf); |
| 936 | return nil; | 937 | return nil; |
| 937 | case Qstatus: | 938 | case Qstatus: |
| @@ -1093,7 +1094,7 @@ dbwrite(Qid qid, char *ba, ulong *n, vlong offset) · 155 unmodified lines |
| 1093 | } | 1094 | } |
| 1094 | | 1095 | |
| 1095 | void | 1096 | void |
| 1096 | badusage() | 1097 | badusage(void) |
| 1097 | { | 1098 | { |
| 1098 | fprint(2, "Usage: odbc [-d] [-p port]\n"); | 1099 | fprint(2, "Usage: odbc [-d] [-p port]\n"); |
| 1099 | exit(1); | 1100 | exit(1); |