KolibriOS/kolibrios
12
4
Fork 13
Code Issues 78 Pull Requests 6 Projects Releases Activity

PasswordGen:

Browse Source 
Now uses libc.obj
Changes in size: 9kb -> 3kb

git-svn-id: svn://kolibrios.org@8747 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
turbocat 2021-05-25 15:59:31 +00:00
parent bd039940d1
commit 8eb9381be2
3 changed files with 40 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
programs/other/PasswordGen/Makefile
View File

@ -1,17 +0,0 @@
KTCC_DIR=D:/ktcc
NAME=passwordgen
KTCC=$(KTCC_DIR)/kos32-tcc.exe
KPACK=D:/ktcc/kpack.exe
SRC=passwordgen.c
CFLAGS=#-I $(KTCC_DIR)/libc/include -L $(KTCC_DIR)/bin/lib -D_KOS32
LIBS= -lck -lbox
all:
$(KTCC) $(CFLAGS) $(SRC) $(LIBS) -o $(NAME)
$(KPACK) $(NAME)
clean:
del $(NAME)

7
programs/other/PasswordGen/Tupfile.lua
View File

@ -2,9 +2,10 @@ if tup.getconfig("NO_TCC") ~= "" then return end
TCC="kos32-tcc" TCC="kos32-tcc"
CFLAGS = "-I../../develop/ktcc/trunk/libc/include"
LDFLAGS = "-nostdlib ../../develop/ktcc/trunk/bin/lib/start.o -L../../develop/ktcc/trunk/bin/lib" CFLAGS = "-I../../develop/libraries/kolibri-libc/include -I../../develop/ktcc/trunk/libc/include"
LIBS = "-lck -lbox" LDFLAGS = "-nostdlib ../../develop/libraries/kolibri-libc/lib/crt0.o -L../../develop/libraries/kolibri-libc/lib -L../../develop/ktcc/trunk/bin/lib"
LIBS = "-ltcc -lbox -lc.obj"
COMMAND=string.format("%s %s %s %s %s ", TCC, CFLAGS, "%f -o %o", LDFLAGS, LIBS) COMMAND=string.format("%s %s %s %s %s ", TCC, CFLAGS, "%f -o %o", LDFLAGS, LIBS)
tup.rule("passwordgen.c", COMMAND .. tup.getconfig("KPACK_CMD"), "passwordgen") tup.rule("passwordgen.c", COMMAND .. tup.getconfig("KPACK_CMD"), "passwordgen")

68
programs/other/PasswordGen/passwordgen.c
View File

@ -3,9 +3,13 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <kos32sys1.h> #include <sys/ksys.h>
#include <clayer/boxlib.h> #include <clayer/boxlib.h>
#define DATA(type, addr, offset) *((type*)((uint8_t*)addr+offset))
#define X_W(X, W) ((X<<16)+W)
#define Y_H X_W
#define WINDOW_WIDTH 400 #define WINDOW_WIDTH 400
#define WINDOW_HEIGHT 180 #define WINDOW_HEIGHT 180
#define EDIT_BOX_PASSWORD_LEN_MAXLEN 16 #define EDIT_BOX_PASSWORD_LEN_MAXLEN 16
@ -13,9 +17,9 @@
#define FONT_SIZE_DEFAULT 0x10000000 #define FONT_SIZE_DEFAULT 0x10000000
#define CHECKBOX_ENABLED 2 #define CHECKBOX_ENABLED 2
const char WINDOW_TITLE[] = "PasswordGen v0.1"; const char WINDOW_TITLE[] = "PasswordGen v0.2";
struct kolibri_system_colors sys_color_table; ksys_colors_table_t sys_color_table;
const color_t DRAWTEXT_FLAG_DEFAULT = 0x90000000; const color_t DRAWTEXT_FLAG_DEFAULT = 0x90000000;
edit_box *edit_box_password_len; edit_box *edit_box_password_len;
@ -64,7 +68,7 @@ void generate_password_internal(char *dst, int length, int flag_az, int flag_AZ,
if (flag_09) { strcat(resulting_char_set, char_set_09); } if (flag_09) { strcat(resulting_char_set, char_set_09); }
if (flag_spec_char) { strcat(resulting_char_set, char_set_spec_char); } if (flag_spec_char) { strcat(resulting_char_set, char_set_spec_char); }
resulting_char_set_len = strlen(resulting_char_set); resulting_char_set_len = strlen(resulting_char_set);
//printf("resulting_char_set = %s\n", resulting_char_set //debug_printf("resulting_char_set = %s\n", resulting_char_set
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
dst[i] = resulting_char_set[rand() % resulting_char_set_len]; dst[i] = resulting_char_set[rand() % resulting_char_set_len];
} }
@ -72,7 +76,7 @@ void generate_password_internal(char *dst, int length, int flag_az, int flag_AZ,
} }
void notify_show(char *text) { void notify_show(char *text) {
start_app("/sys/@notify", text); _ksys_exec("/sys/@notify", text);
} }
void* safe_malloc(size_t size) { void* safe_malloc(size_t size) {
@ -88,10 +92,10 @@ void* safe_malloc(size_t size) {
void copy_to_clipboard(char *text) { void copy_to_clipboard(char *text) {
char *temp_buffer = safe_malloc(EDIT_BOX_PASSWORD_GENERATED_MAXLEN + 12); char *temp_buffer = safe_malloc(EDIT_BOX_PASSWORD_GENERATED_MAXLEN + 12);
memset(temp_buffer, 0, EDIT_BOX_PASSWORD_GENERATED_MAXLEN); memset(temp_buffer, 0, EDIT_BOX_PASSWORD_GENERATED_MAXLEN);
DATA(char,temp_buffer,4) = 0; /* TEXT */ DATA(char,temp_buffer,4) = KSYS_CLIP_TEXT; /* TEXT */
DATA(char,temp_buffer,8) = 1; /* CP866 */ DATA(char,temp_buffer,8) = KSYS_CLIP_CP866; /* CP866 */
strncpy(temp_buffer+12, text, EDIT_BOX_PASSWORD_GENERATED_MAXLEN - 1); strncpy(temp_buffer+12, text, EDIT_BOX_PASSWORD_GENERATED_MAXLEN - 1);
kol_clip_set(strlen(text) + 12, temp_buffer); _ksys_clip_set(strlen(text) + 12, temp_buffer);
notify_show("'Copied to clipboard!' -I"); notify_show("'Copied to clipboard!' -I");
free(temp_buffer); free(temp_buffer);
} }
@ -136,15 +140,15 @@ check_box* create_check_box(unsigned int left_s, unsigned int top_s, unsigned in
/* ---------------------------------------------------------- */ /* ---------------------------------------------------------- */
void redraw_window() { void redraw_window() {
pos_t win_pos = get_mouse_pos(0); ksys_pos_t win_pos = _ksys_get_mouse_pos(KSYS_MOUSE_SCREEN_POS);
begin_draw(); _ksys_start_draw();
sys_create_window(win_pos.x, win_pos.y, WINDOW_WIDTH, WINDOW_HEIGHT, WINDOW_TITLE, sys_color_table.work_area, 0x14); _ksys_create_window(win_pos.x, win_pos.y, WINDOW_WIDTH, WINDOW_HEIGHT, WINDOW_TITLE, sys_color_table.work_area, 0x14);
edit_box_draw(edit_box_password_len); edit_box_draw(edit_box_password_len);
draw_text_sys("Password length: ", 15, 34 + 5, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.work_text); _ksys_draw_text("Password length: ", 15, 34 + 5, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.work_text);
draw_text_sys("Characters: ", 15, 68, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.work_text); _ksys_draw_text("Characters: ", 15, 68, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.work_text);
draw_text_sys("Generated password: ", 15, 102 + 5, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.work_text); _ksys_draw_text("Generated password: ", 15, 102 + 5, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.work_text);
check_box_draw2(check_box_az); check_box_draw2(check_box_az);
check_box_draw2(check_box_AZ); check_box_draw2(check_box_AZ);
@ -153,13 +157,13 @@ void redraw_window() {
edit_box_draw(edit_box_password_generated); edit_box_draw(edit_box_password_generated);
define_button(X_W(170,100), Y_H(136,30), BTN_GENERATE, sys_color_table.work_button); _ksys_define_button(170, 136, 100, 30, BTN_GENERATE, sys_color_table.work_button);
draw_text_sys("Generate!", 182, 136 + 7, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.work_button_text); _ksys_draw_text("Generate!", 182, 136 + 7, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.work_button_text);
define_button(X_W(370 - 60, 60), Y_H(136,30), BTN_COPY, sys_color_table.work_button); _ksys_define_button(370-60, 136, 60, 30, BTN_COPY, sys_color_table.work_button);
draw_text_sys("Copy", 370 - 60 + 15, 136 + 7, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.work_button_text); _ksys_draw_text("Copy", 370 - 60 + 15, 136 + 7, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.work_button_text);
end_draw(); _ksys_end_draw();
} }
/* create and initialize components */ /* create and initialize components */
@ -207,21 +211,21 @@ int main(int argc, const char *argv[]) {
srand(time(0)*2/3); /* seeding the pseudo random number generator*/ srand(time(0)*2/3); /* seeding the pseudo random number generator*/
kolibri_boxlib_init(); kolibri_boxlib_init();
get_system_colors(&sys_color_table); _ksys_get_system_colors(&sys_color_table);
set_event_mask(0xC0000027); _ksys_set_event_mask(0xC0000027);
create_components(); /* create and init some visual components */ create_components(); /* create and init some visual components */
do do
{ {
gui_event = get_os_event(); gui_event = _ksys_get_event();
switch(gui_event) switch(gui_event)
{ {
case KOLIBRI_EVENT_NONE: case KSYS_EVENT_NONE:
break; break;
case KOLIBRI_EVENT_REDRAW: case KSYS_EVENT_REDRAW:
redraw_window(); redraw_window();
break; break;
case KOLIBRI_EVENT_MOUSE: case KSYS_EVENT_MOUSE:
edit_box_mouse(edit_box_password_len); edit_box_mouse(edit_box_password_len);
check_box_mouse2(check_box_az); check_box_mouse2(check_box_az);
check_box_mouse2(check_box_AZ); check_box_mouse2(check_box_AZ);
@ -229,13 +233,13 @@ int main(int argc, const char *argv[]) {
check_box_mouse2(check_box_spec_char); check_box_mouse2(check_box_spec_char);
edit_box_mouse(edit_box_password_generated); edit_box_mouse(edit_box_password_generated);
break; break;
case KOLIBRI_EVENT_KEY: case KSYS_EVENT_KEY:
keyval = get_key().val; keyval = _ksys_get_key().val;
edit_box_key(edit_box_password_len, keyval); edit_box_key(edit_box_password_len, keyval);
edit_box_key(edit_box_password_generated, keyval); edit_box_key(edit_box_password_generated, keyval);
break; break;
case KOLIBRI_EVENT_BUTTON: case KSYS_EVENT_BUTTON:
pressed_button = get_os_button(); pressed_button = _ksys_get_button();
switch (pressed_button) switch (pressed_button)
{ {
case BTN_GENERATE: case BTN_GENERATE:
@ -249,10 +253,10 @@ int main(int argc, const char *argv[]) {
break; break;
case BTN_QUIT: case BTN_QUIT:
exit(0); return 0;
break; break;
} }
} }
} while(1); } while(1);
exit(0); return 0;
} }