Overview
| Comment: | Validate picture names in the picture editor. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
c43fd7265c91a97028971978f6515059 |
| User & Date: | user on 2021-04-10 00:05:28 |
| Other Links: | manifest | tags |
Context
|
2021-04-10
| ||
| 00:49 | Add a TODO file check-in: 455d10f279 user: user tags: trunk | |
| 00:05 | Validate picture names in the picture editor. check-in: c43fd7265c user: user tags: trunk | |
|
2021-04-09
| ||
| 23:23 | Add the possibility to rename a picture in the picture editor. check-in: 602174dd57 user: user tags: trunk | |
Changes
Modified picedit.c from [5a90fb755b] to [c6a6f01d28].
| ︙ | ︙ | |||
18 19 20 21 22 23 24 25 26 27 28 29 30 31 |
#include "quarks.h"
#include "cursorshapes.h"
typedef struct {
Uint8 size,meth;
Uint8 data[0]; // the first row is all 0, since the compression algorithm requires this
} Picture;
static int load_picture_file(void) {
sqlite3_stmt*st=0;
FILE*fp;
char*nam;
char*buf=0;
int r=0;
| > > > > > > > > > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 |
#include "quarks.h"
#include "cursorshapes.h"
typedef struct {
Uint8 size,meth;
Uint8 data[0]; // the first row is all 0, since the compression algorithm requires this
} Picture;
static void fn_valid_name(sqlite3_context*cxt,int argc,sqlite3_value**argv) {
const char*s=sqlite3_value_text(*argv);
if(!s || !*s || s[strspn(s,"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_-0123456789")]) {
sqlite3_result_error(cxt,"Invalid name",-1);
return;
}
sqlite3_result_value(cxt,*argv);
}
static int load_picture_file(void) {
sqlite3_stmt*st=0;
FILE*fp;
char*nam;
char*buf=0;
int r=0;
|
| ︙ | ︙ | |||
921 922 923 924 925 926 927 |
}
static int add_picture(int t) {
sqlite3_stmt*st;
const char*s=screen_prompt("Enter name of new picture:");
int i;
if(!s || !*s) return 0;
| | | | | 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 |
}
static int add_picture(int t) {
sqlite3_stmt*st;
const char*s=screen_prompt("Enter name of new picture:");
int i;
if(!s || !*s) return 0;
if(sqlite3_prepare_v2(userdb,"INSERT INTO `PICEDIT`(`NAME`,`TYPE`,`DATA`) SELECT VALID_NAME(?1)||'.IMG',1,X'';",-1,&st,0)) {
screen_message(sqlite3_errmsg(userdb));
return 0;
}
sqlite3_bind_text(st,1,s,-1,0);
i=sqlite3_step(st);
sqlite3_finalize(st);
if(i!=SQLITE_DONE) {
screen_message(sqlite3_errmsg(userdb));
return 0;
}
edit_picture(sqlite3_last_insert_rowid(userdb));
return 1;
}
static int delete_picture(void) {
sqlite3_stmt*st;
const char*s=screen_prompt("Enter name of picture to delete:");
int i;
if(!s || !*s) return 0;
if(sqlite3_prepare_v2(userdb,"DELETE FROM `PICEDIT` WHERE `NAME`=?1||'.IMG';",-1,&st,0)) {
screen_message(sqlite3_errmsg(userdb));
return 0;
}
sqlite3_bind_text(st,1,s,-1,0);
i=sqlite3_step(st);
sqlite3_finalize(st);
if(i!=SQLITE_DONE) {
screen_message(sqlite3_errmsg(userdb));
return 0;
}
return 1;
}
static void rename_picture(void) {
sqlite3_stmt*st;
const char*s=screen_prompt("Old name:");
int i;
if(!s || !*s) return;
if(sqlite3_prepare_v2(userdb,"UPDATE `PICEDIT` SET `NAME`=VALID_NAME(?2)||'.IMG' WHERE `NAME`=?1||'.IMG';",-1,&st,0)) {
screen_message(sqlite3_errmsg(userdb));
return;
}
sqlite3_bind_text(st,1,s,-1,SQLITE_TRANSIENT);
s=screen_prompt("New name:");
if(!s || !*s) {
sqlite3_finalize(st);
|
| ︙ | ︙ | |||
990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 |
sqlite3_int64*ids;
SDL_Event ev;
SDL_Rect r;
sqlite3_stmt*st;
int sc=0;
int max=load_picture_file();
int i,n;
init_palette();
optionquery[1]=Q_imageSize;
picture_size=strtol(xrm_get_resource(resourcedb,optionquery,optionquery,2)?:"16",0,10);
set_cursor(XC_arrow);
set_caption();
i=sqlite3_prepare_v3(userdb,"SELECT `ID`,SUBSTR(`NAME`,1,LENGTH(`NAME`)-4),`TYPE` FROM `PICEDIT` WHERE `TYPE` ORDER BY `NAME` LIMIT ?1 OFFSET ?2;",-1,SQLITE_PREPARE_PERSISTENT,&st,0);
if(i) fatal("SQL error (%d): %s\n",i,sqlite3_errmsg(userdb));
| > | 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 |
sqlite3_int64*ids;
SDL_Event ev;
SDL_Rect r;
sqlite3_stmt*st;
int sc=0;
int max=load_picture_file();
int i,n;
sqlite3_create_function(userdb,"VALID_NAME",1,SQLITE_UTF8|SQLITE_DETERMINISTIC,0,fn_valid_name,0,0);
init_palette();
optionquery[1]=Q_imageSize;
picture_size=strtol(xrm_get_resource(resourcedb,optionquery,optionquery,2)?:"16",0,10);
set_cursor(XC_arrow);
set_caption();
i=sqlite3_prepare_v3(userdb,"SELECT `ID`,SUBSTR(`NAME`,1,LENGTH(`NAME`)-4),`TYPE` FROM `PICEDIT` WHERE `TYPE` ORDER BY `NAME` LIMIT ?1 OFFSET ?2;",-1,SQLITE_PREPARE_PERSISTENT,&st,0);
if(i) fatal("SQL error (%d): %s\n",i,sqlite3_errmsg(userdb));
|
| ︙ | ︙ |