From e71e8b2d8648028b0fffd37d900506d9109411f4 Mon Sep 17 00:00:00 2001 From: Antoni Sawicki Date: Mon, 6 May 2019 16:37:19 -0700 Subject: s/IMG/ICO_/g --- dir.c | 70 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dir.c b/dir.c index fed0ae9..3459bd2 100644 --- a/dir.c +++ b/dir.c @@ -1,8 +1,8 @@ #include "wfm.h" -char DIRIMG[256], AUPIMG[256], ADNIMG[256], GENIMG[256], NEWIMG[256], ZIPIMG[256]; -char IMGIMG[256], OFFIMG[256], PDFIMG[256]; -char TXTIMG[256], EXEIMG[256], MEDIMG[257], ISOIMG[256], LNKIMG[256]; +char ICO_DIR[256], ICO_AUP[256], ICO_ADN[256], ICO_GEN[256], ICO_NEW[256], ICO_ZIP[256]; +char ICO_IMG[256], ICO_OFF[256], ICO_PDF[256]; +char ICO_TXT[256], ICO_EXE[256], ICO_MED[257], ICO_ISO[256], ICO_LNK[256]; regex_t reg_zip, reg_img, reg_pdf, reg_exe, reg_txt, reg_off, reg_med, reg_iso; char M_HR[]="(Last Hour)"; @@ -23,20 +23,20 @@ char tHL_COLOR[]="FFD700"; static const char *access_string[]={ "none", "readonly", "readwrite" }; void dir_icoinita(void) { - snprintf(DIRIMG, sizeof(DIRIMG), "\"Dir\"", rt.iconsurl); - snprintf(LNKIMG, sizeof(LNKIMG), "\"Symlink\"", rt.iconsurl); - snprintf(AUPIMG, sizeof(AUPIMG), "\"Up\"", rt.iconsurl); - snprintf(ADNIMG, sizeof(ADNIMG), "\"Down\"", rt.iconsurl); - snprintf(GENIMG, sizeof(GENIMG), "\"Unknown\"", rt.iconsurl); - snprintf(NEWIMG, sizeof(NEWIMG), "\"New\"", rt.iconsurl); - snprintf(ZIPIMG, sizeof(ZIPIMG), "\"Archive\"", rt.iconsurl); - snprintf(IMGIMG, sizeof(IMGIMG), "\"Image\"", rt.iconsurl); - snprintf(OFFIMG, sizeof(OFFIMG), "\"Office", rt.iconsurl); - snprintf(PDFIMG, sizeof(PDFIMG), "\"PDF\"", rt.iconsurl); - snprintf(TXTIMG, sizeof(TXTIMG), "\"Text\"", rt.iconsurl); - snprintf(EXEIMG, sizeof(EXEIMG), "\"Exec\"", rt.iconsurl); - snprintf(MEDIMG, sizeof(MEDIMG), "\"Multimedia\"", rt.iconsurl); - snprintf(ISOIMG, sizeof(ISOIMG), "\"Disk", rt.iconsurl); + snprintf(ICO_DIR, sizeof(ICO_DIR), "\"Dir\"", rt.iconsurl); + snprintf(ICO_LNK, sizeof(ICO_LNK), "\"Symlink\"", rt.iconsurl); + snprintf(ICO_AUP, sizeof(ICO_AUP), "\"Up\"", rt.iconsurl); + snprintf(ICO_ADN, sizeof(ICO_ADN), "\"Down\"", rt.iconsurl); + snprintf(ICO_GEN, sizeof(ICO_GEN), "\"Unknown\"", rt.iconsurl); + snprintf(ICO_NEW, sizeof(ICO_NEW), "\"New\"", rt.iconsurl); + snprintf(ICO_ZIP, sizeof(ICO_ZIP), "\"Archive\"", rt.iconsurl); + snprintf(ICO_IMG, sizeof(ICO_IMG), "\"Image\"", rt.iconsurl); + snprintf(ICO_OFF, sizeof(ICO_OFF), "\"Office", rt.iconsurl); + snprintf(ICO_PDF, sizeof(ICO_PDF), "\"PDF\"", rt.iconsurl); + snprintf(ICO_TXT, sizeof(ICO_TXT), "\"Text\"", rt.iconsurl); + snprintf(ICO_EXE, sizeof(ICO_EXE), "\"Exec\"", rt.iconsurl); + snprintf(ICO_MED, sizeof(ICO_MED), "\"Multimedia\"", rt.iconsurl); + snprintf(ICO_ISO, sizeof(ICO_ISO), "\"Disk", rt.iconsurl); if( regcomp(®_zip, "\\.(zip|rar|tar|gz|tgz|z|arj|bz|tbz|7z|xz)$", REG_EXTENDED | REG_ICASE)!=0 || @@ -308,26 +308,26 @@ void dirlist(void) { // if(strcmp(sortby, "size")==0) { snprintf(namepfx, 1024, " Filename", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); - snprintf(sizepfx, 1024, " Size %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, ADNIMG); + snprintf(sizepfx, 1024, " Size %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, ICO_ADN); snprintf(datepfx, 1024, " Modified", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); } else if(strcmp(sortby, "rsize")==0) { snprintf(namepfx, 1024, " Filename", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); - snprintf(sizepfx, 1024, " Size %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, AUPIMG); + snprintf(sizepfx, 1024, " Size %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, ICO_AUP); snprintf(datepfx, 1024, " Modified", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); } else if(strcmp(sortby, "date")==0) { snprintf(namepfx, 1024, " Filename", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); snprintf(sizepfx, 1024, " Size", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); - snprintf(datepfx, 1024, " Modified %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, ADNIMG); + snprintf(datepfx, 1024, " Modified %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, ICO_ADN); } else if(strcmp(sortby, "rdate")==0) { snprintf(namepfx, 1024, " Filename", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); snprintf(sizepfx, 1024, " Size", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); - snprintf(datepfx, 1024, " Modified %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, AUPIMG); + snprintf(datepfx, 1024, " Modified %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, ICO_AUP); } else if(strcmp(sortby, "name")==0) { - snprintf(namepfx, 1024, " Filename %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, ADNIMG); + snprintf(namepfx, 1024, " Filename %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, ICO_ADN); snprintf(sizepfx, 1024, " Size", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); snprintf(datepfx, 1024, " Modified", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); } else if(strcmp(sortby, "rname")==0) { - snprintf(namepfx, 1024, " Filename %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, AUPIMG); + snprintf(namepfx, 1024, " Filename %s", cgiScriptName, wp.virt_dirname_urlencoded, rt.token, ICO_AUP); snprintf(sizepfx, 1024, " Size", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); snprintf(datepfx, 1024, " Modified", cgiScriptName, wp.virt_dirname_urlencoded, rt.token); } else { @@ -405,11 +405,11 @@ void dirlist(void) { if(strcmp(highlight, name)==0) { - icon=NEWIMG; + icon=ICO_NEW; linecolor=tHIGH_COLOR; } else { - icon=DIRIMG; + icon=ICO_DIR; if(rt.js) { linecolor=tNORMAL_COLOR; } @@ -500,20 +500,20 @@ void dirlist(void) { else if(now-direntry[e].mtime < 365*24*3600) stime=M_YR; else stime=M_OLD; - if(regexec(®_zip, name, 0, 0, 0)==0) { icon=ZIPIMG; editable=0; } - else if(regexec(®_img, name, 0, 0, 0)==0) { icon=IMGIMG; editable=0; } - else if(regexec(®_off, name, 0, 0, 0)==0) { icon=OFFIMG; editable=0; } - else if(regexec(®_pdf, name, 0, 0, 0)==0) { icon=PDFIMG; editable=0; } - else if(regexec(®_txt, name, 0, 0, 0)==0) { icon=TXTIMG; editable=1; } - else if(regexec(®_exe, name, 0, 0, 0)==0) { icon=EXEIMG; editable=0; } - else if(regexec(®_med, name, 0, 0, 0)==0) { icon=MEDIMG; editable=0; } - else if(regexec(®_iso, name, 0, 0, 0)==0) { icon=ISOIMG; editable=0; } - else { icon=GENIMG; editable=0; } + if(regexec(®_zip, name, 0, 0, 0)==0) { icon=ICO_ZIP; editable=0; } + else if(regexec(®_img, name, 0, 0, 0)==0) { icon=ICO_IMG; editable=0; } + else if(regexec(®_off, name, 0, 0, 0)==0) { icon=ICO_OFF; editable=0; } + else if(regexec(®_pdf, name, 0, 0, 0)==0) { icon=ICO_PDF; editable=0; } + else if(regexec(®_txt, name, 0, 0, 0)==0) { icon=ICO_TXT; editable=1; } + else if(regexec(®_exe, name, 0, 0, 0)==0) { icon=ICO_EXE; editable=0; } + else if(regexec(®_med, name, 0, 0, 0)==0) { icon=ICO_MED; editable=0; } + else if(regexec(®_iso, name, 0, 0, 0)==0) { icon=ICO_ISO; editable=0; } + else { icon=ICO_GEN; editable=0; } if(cfg.edit_any_file) { editable=1; } if(strcmp(highlight, name)==0) { - icon=NEWIMG; + icon=ICO_NEW; linecolor=tHIGH_COLOR; } else { -- cgit v1.2.3