Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
| Comment: | Only print the "Loading resources from..." line when the output is a TTY. Ticket #168. (CVS 939) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
92ded93376635f37e2f5a7a8f4077c85 |
| User & Date: | drh 2003-04-26 02:50:11 |
|
2003-04-26
| ||
| 03:03 | Fix the shell tool to do a better job of ignoring whitespace. Ticket #234. (CVS 940) (check-in: 639957e9 user: drh tags: trunk) | |
| 02:50 | Only print the "Loading resources from..." line when the output is a TTY. Ticket #168. (CVS 939) (check-in: 92ded933 user: drh tags: trunk) | |
| 02:40 | Do not use the return value of fcntl() to find the reason that it failed. Use errno instead. Tickets #240 and #270. (CVS 938) (check-in: acf9e980 user: drh tags: trunk) | |
Changes to src/shell.c.
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 .. 42 43 44 45 46 47 48 49 50 51 52 53 54 55 .... 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 .... 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 |
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** ** $Id: shell.c,v 1.71 2003/04/24 01:45:04 drh Exp $ */ #include <stdlib.h> #include <string.h> #include <stdio.h> #include "sqlite.h" #include <ctype.h> ................................................................................ #else # define readline(p) getline(p,stdin) # define add_history(X) # define read_history(X) # define write_history(X) # define stifle_history(X) #endif /* ** The following is the open SQLite database. We make a pointer ** to this database a static variable so that it can be accessed ** by the SIGINT handler to interrupt database processing. */ static sqlite *db = 0; ................................................................................ fprintf(stderr,"%s: out of memory!\n", Argv0); exit(1); } sprintf(sqliterc,"%s/.sqliterc",home_dir); free(home_dir); } in = fopen(sqliterc,"r"); if(in) { printf("Loading resources from %s\n",sqliterc); process_input(p,in); fclose(in); } return; } ................................................................................ rc = sqlite_exec(db, argv[2], callback, &data, &zErrMsg); if( rc!=0 && zErrMsg!=0 ){ fprintf(stderr,"SQL error: %s\n", zErrMsg); exit(1); } } }else{ extern int isatty(); if( isatty(fileno(stdout)) && isatty(fileno(stdin)) ){ char *zHome; char *zHistory = 0; printf( "SQLite version %s\n" "Enter \".help\" for instructions\n", sqlite_version |
| > > > > | < |
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 .. 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 .... 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 .... 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 |
** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** ** $Id: shell.c,v 1.72 2003/04/26 02:50:11 drh Exp $ */ #include <stdlib.h> #include <string.h> #include <stdio.h> #include "sqlite.h" #include <ctype.h> ................................................................................ #else # define readline(p) getline(p,stdin) # define add_history(X) # define read_history(X) # define write_history(X) # define stifle_history(X) #endif /* Make sure isatty() has a prototype. */ extern int isatty(); /* ** The following is the open SQLite database. We make a pointer ** to this database a static variable so that it can be accessed ** by the SIGINT handler to interrupt database processing. */ static sqlite *db = 0; ................................................................................ fprintf(stderr,"%s: out of memory!\n", Argv0); exit(1); } sprintf(sqliterc,"%s/.sqliterc",home_dir); free(home_dir); } in = fopen(sqliterc,"r"); if(in && isatty(fileno(stdout))) { printf("Loading resources from %s\n",sqliterc); process_input(p,in); fclose(in); } return; } ................................................................................ rc = sqlite_exec(db, argv[2], callback, &data, &zErrMsg); if( rc!=0 && zErrMsg!=0 ){ fprintf(stderr,"SQL error: %s\n", zErrMsg); exit(1); } } }else{ if( isatty(fileno(stdout)) && isatty(fileno(stdin)) ){ char *zHome; char *zHistory = 0; printf( "SQLite version %s\n" "Enter \".help\" for instructions\n", sqlite_version |