Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | :-) (CVS 30) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
9b8458bbcef19882f14f0e96575fc3f0 |
User & Date: | drh 2000-05-31 23:33:17.000 |
Context
2000-06-01
| ||
00:03 | :-) (CVS 31) (check-in: f035dec94a user: drh tags: trunk) | |
2000-05-31
| ||
23:33 | :-) (CVS 30) (check-in: 9b8458bbce user: drh tags: trunk) | |
22:58 | :-) (CVS 29) (check-in: 09054df318 user: drh tags: trunk) | |
Changes
Changes to src/shell.c.
︙ | ︙ | |||
20 21 22 23 24 25 26 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** ** $Id: shell.c,v 1.5 2000/05/31 23:33:17 drh Exp $ */ #include <stdlib.h> #include <string.h> #include <stdio.h> #include "sqlite.h" #include <unistd.h> #include <ctype.h> |
︙ | ︙ | |||
133 134 135 136 137 138 139 140 141 142 143 144 145 146 | /* ** These are the allowed modes. */ #define MODE_Line 0 /* One field per line. Blank line between records */ #define MODE_Column 1 /* One record per line in neat columns */ #define MODE_List 2 /* One record per line with a separator */ /* ** Number of elements in an array */ #define ArraySize(X) (sizeof(X)/sizeof(X[0])) /* | > | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | /* ** These are the allowed modes. */ #define MODE_Line 0 /* One field per line. Blank line between records */ #define MODE_Column 1 /* One record per line in neat columns */ #define MODE_List 2 /* One record per line with a separator */ #define MODE_Html 3 /* Generate an XHTML table */ /* ** Number of elements in an array */ #define ArraySize(X) (sizeof(X)/sizeof(X[0])) /* |
︙ | ︙ | |||
172 173 174 175 176 177 178 | for(i=0; i<nArg; i++){ int w; if( i<ArraySize(p->colWidth) && p->colWidth[i]>0 ){ w = p->colWidth[i]; }else{ w = 10; } | | > | 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | for(i=0; i<nArg; i++){ int w; if( i<ArraySize(p->colWidth) && p->colWidth[i]>0 ){ w = p->colWidth[i]; }else{ w = 10; } fprintf(p->out,"%-*.*s%s",w,w,"-------------------------------------" "------------------------------------------------------------", i==nArg-1 ? "\n": " "); } } for(i=0; i<nArg; i++){ int w; if( i<ArraySize(p->colWidth) && p->colWidth[i]>0 ){ w = p->colWidth[i]; |
︙ | ︙ | |||
198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | } } for(i=0; i<nArg; i++){ fprintf(p->out,"%s%s",azArg[i], i==nArg-1 ? "\n" : p->separator); } break; } } return 0; } /* ** Text of a help message */ static char zHelp[] = ".exit Exit this program\n" ".explain Set output mode suitable for EXPLAIN\n" ".header ON|OFF Turn display of headers on or off\n" ".help Show this message\n" ".indices TABLE Show names of all indices on TABLE\n" | > > > > > > > > > > > > > > > > > | | | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | } } for(i=0; i<nArg; i++){ fprintf(p->out,"%s%s",azArg[i], i==nArg-1 ? "\n" : p->separator); } break; } case MODE_Html: { if( p->cnt++==0 && p->showHeader ){ fprintf(p->out,"<TR>"); for(i=0; i<nArg; i++){ fprintf(p->out,"<TH>%s</TH>",azCol[i]); } fprintf(p->out,"</TR>\n"); } for(i=0; i<nArg; i++){ fprintf(p->out,"<TR>"); for(i=0; i<nArg; i++){ fprintf(p->out,"<TD>%s</TD>",azArg[i]); } fprintf(p->out,"</TD>\n"); } break; } } return 0; } /* ** Text of a help message */ static char zHelp[] = ".exit Exit this program\n" ".explain Set output mode suitable for EXPLAIN\n" ".header ON|OFF Turn display of headers on or off\n" ".help Show this message\n" ".indices TABLE Show names of all indices on TABLE\n" ".mode MODE Set mode to one of \"line\", \"column\", " "\"list\", or \"html\"\n" ".output FILENAME Send output to FILENAME\n" ".output stdout Send output to the screen\n" ".schema ?TABLE? Show the CREATE statements\n" ".separator STRING Change separator string for \"list\" mode\n" ".tables List names all tables in the database\n" ".width NUM NUM ... Set column widths for \"column\" mode\n" ; |
︙ | ︙ | |||
313 314 315 316 317 318 319 320 321 322 323 324 325 326 | int n2 = strlen(azArg[1]); if( strncmp(azArg[1],"line",n2)==0 ){ p->mode = MODE_Line; }else if( strncmp(azArg[1],"column",n2)==0 ){ p->mode = MODE_Column; }else if( strncmp(azArg[1],"list",n2)==0 ){ p->mode = MODE_List; } }else if( c=='o' && strncmp(azArg[0], "output", n)==0 && nArg==2 ){ if( p->out!=stdout ){ fclose(p->out); } | > > | 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 | int n2 = strlen(azArg[1]); if( strncmp(azArg[1],"line",n2)==0 ){ p->mode = MODE_Line; }else if( strncmp(azArg[1],"column",n2)==0 ){ p->mode = MODE_Column; }else if( strncmp(azArg[1],"list",n2)==0 ){ p->mode = MODE_List; }else if( strncmp(azArg[1],"html",n2)==0 ){ p->mode = MODE_Html; } }else if( c=='o' && strncmp(azArg[0], "output", n)==0 && nArg==2 ){ if( p->out!=stdout ){ fclose(p->out); } |
︙ | ︙ | |||
387 388 389 390 391 392 393 394 395 396 | azArg[0]); } } int main(int argc, char **argv){ sqlite *db; char *zErrMsg = 0; struct callback_data data; if( argc!=2 && argc!=3 ){ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < < < < < < | | 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 | azArg[0]); } } int main(int argc, char **argv){ sqlite *db; char *zErrMsg = 0; char *argv0 = argv[0]; struct callback_data data; memset(&data, 0, sizeof(data)); data.mode = MODE_List; strcpy(data.separator,"|"); data.showHeader = 0; while( argc>=2 && argv[1][0]=='-' ){ if( strcmp(argv[1],"-html")==0 ){ data.mode = MODE_Html; argc--; argv++; }else if( strcmp(argv[1],"-list")==0 ){ data.mode = MODE_List; argc--; argv++; }else if( strcmp(argv[1],"-line")==0 ){ data.mode = MODE_Line; argc--; argv++; }else if( argc>=3 && strcmp(argv[0],"-separator")==0 ){ sprintf(data.separator,"%.*s",sizeof(data.separator)-1,argv[2]); argc -= 2; argv += 2; }else if( strcmp(argv[1],"-header")==0 ){ data.showHeader = 1; argc--; argv++; }else if( strcmp(argv[1],"-noheader")==0 ){ data.showHeader = 0; argc--; argv++; }else{ fprintf(stderr,"%s: unknown option: %s\n", argv0, argv[1]); return 1; } } if( argc!=2 && argc!=3 ){ fprintf(stderr,"Usage: %s ?OPTIONS? FILENAME ?SQL?\n", argv0); exit(1); } db = sqlite_open(argv[1], 0666, &zErrMsg); if( db==0 ){ fprintf(stderr,"Unable to open database \"%s\": %s\n", argv[1], zErrMsg); exit(1); } data.out = stdout; if( argc==3 ){ if( sqlite_exec(db, argv[2], callback, &data, &zErrMsg)!=0 && zErrMsg!=0 ){ fprintf(stderr,"SQL error: %s\n", zErrMsg); exit(1); } }else{ char *zLine; char *zSql = 0; int nSql = 0; int istty = isatty(0); if( istty ){ printf( "Enter \".help\" for instructions\n" ); } while( (zLine = one_input_line(zSql, istty))!=0 ){ if( zLine && zLine[0]=='.' ){ do_meta_command(zLine, db, &data); free(zLine); continue; } if( zSql==0 ){ nSql = strlen(zLine); zSql = malloc( nSql+1 ); strcpy(zSql, zLine); }else{ int len = strlen(zLine); zSql = realloc( zSql, nSql + len + 2 ); if( zSql==0 ){ fprintf(stderr,"%s: out of memory!\n", argv0); exit(1); } strcpy(&zSql[nSql++], "\n"); strcpy(&zSql[nSql], zLine); nSql += len; } free(zLine); |
︙ | ︙ |