X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=blobdiff_plain;f=src%2Fapc%2Fscanner.c;h=a999c7b9e40d6a3cff1b0079c4dac142d5852f1e;hp=089d0f38329ce2a6e1e7761256b1d29372662b9a;hb=89094ec20ef408709bf9f211c2f5a75814e363da;hpb=121c6de807ec0eb9f8be2c5e316dd1dd9f3e8102 diff --git a/src/apc/scanner.c b/src/apc/scanner.c index 089d0f3..a999c7b 100644 --- a/src/apc/scanner.c +++ b/src/apc/scanner.c @@ -19,9 +19,15 @@ #include //exit #include //chdir #include //opendir +/* Libs */ +#include +/* Internal */ +#include "parser.tab.h" /* Public */ -int scanner_init(void); -int scanner(void); +int scanner_init(void); +void scanner_quit(void); +int scanner(void); +int scanner_scanpixels(int*,int); /* Private */ #ifndef DL_STACKSIZE #define DL_STACKSIZE 64 @@ -36,8 +42,8 @@ void lexer_pushtok(int, int); static int dredge_current_depth(void); extern //lexer.c -struct dirent* lexer_direntpa[]; -extern //main.c +struct dirent* lexer_direntpa[], **lexer_direntpp; +extern //SRC_DIR/bin/tools/apc.c const char* cargs['Z']; struct dirlist @@ -81,11 +87,19 @@ struct dirlist */ int scanner_init #define CWDSTR "./" -#define ROOTDIR (cargs['r'] ? cargs['r'] : CWDSTR) +#define ROOTDIR (cargs['d'] ? cargs['d'] : CWDSTR) () { DL_INIT(); DL_STACK[0].dirp = opendir(ROOTDIR); - return DL_STACK[0].dirp == NULL || dredge_current_depth() == 0; + printf("Root dir %s\n",ROOTDIR); + return !chdir(ROOTDIR) && (DL_STACK[0].dirp == NULL || dredge_current_depth() == -1); +} + +/* Quit */ +void scanner_quit +() +{ if (DL_CURDIR()) + closedir(DL_CURDIR()); } /* Scanner @@ -97,56 +111,61 @@ int scanner_init after pushing a new directory to the directory list, the scanner will dredge the directory and alphabetically sort all file entries into the lexer's file array, while placing all subdirectory entries in the current depth's child - directory stack to the scanned later. + directory stack to be scanned later. - Returns the number of elements added to the lexer's file array. + Returns the number of tokens generated on success, -1 on error. */ int scanner -#define S(S)#S //stringifier -#define ERR_CHILD "Fatal: Maximum of " S(DL_CD_STACKSIZE) \ +#define $($)#$ //stringifier +#define ERR_CHILD "Fatal: Maximum of " $(DL_CD_STACKSIZE) \ " child directories exceeded for directory at depth %i\n" \ ,DL_LEN() -#define ERR_DEPTH "Fatal: Maximum directory depth of " S(DL_STACKSIZE) \ +#define ERR_DEPTH "Fatal: Maximum directory depth of " $(DL_STACKSIZE) \ " exceeded during directory scan\n" #define ERR_DL "Fatal: Directory List Stack Corruption %x\n", DL_LEN() -#define TOK_CLOPEN 0x55, 0 //TODO -#define TOK_CLCLOSE 0x56, 0 //TODO () { struct dirent* direntp; - parse: + struct DIR* DIRp; + int ntok = 0; + scan: if (DL_CD_LEN() >= DL_CD_STACKSIZE)//fail if maxchildren exceeded { fprintf(stderr, ERR_CHILD); goto fail; } - if (DL_CD_LEN() > 0) //There are entities to process at this depth - { if (direntp = DL_CD_POP()) //If the dirent is null, the library - goto libfail; //function in dirent has failed - lexer_lex(direntp->d_name); //lex the directory name - if (DL_LEN() >= DL_STACKSIZE) //fail if maxdepth exceeded + if (DL_CD_LEN() > 0) //There are entities to process + { if ((direntp = DL_CD_POP()) == NULL)//If the dirent is null, the library + goto libfail; //function in dirent has failed + ntok += lexer_lex(direntp->d_name); //lex the directory name + if (DL_LEN() >= DL_STACKSIZE) //fail if maxdepth exceeded { fprintf(stderr, ERR_DEPTH); goto fail; } - if (chdir(direntp->d_name)) //move into the new directory - goto libfail; - if (DL_PUSH(opendir(CWDSTR))) //open the cwd - goto libfail; - lexer_pushtok(TOK_CLOPEN); //Push "Open Directory" token - return dredge_current_depth(); //Filter and sort the current depth + if (chdir(direntp->d_name)) //move into the new directory + goto libfail; + DL_PUSH(opendir(CWDSTR)); + if (DL_CURDIR() == NULL) //open the cwd + goto libfail; + lexer_pushtok(CLOPEN, 0); //Push "Open Directory" token + ntok++; + return dredge_current_depth(); //Filter and sort the current depth } - else if (DL_LEN() >= 0) //Any dirs left? (Including root) - { if (closedir(DL_POP())) //close the directory we just left + else if (DL_LEN() >= 0) //Any dirs left? (Including root) + { if (closedir(DL_POP())) //close the directory we just left goto libfail; - lexer_pushtok(TOK_CLCLOSE); //Push "Close Directory" token - if (DL_LEN() == -1) //If we just popped root, we're done - return 0; - if (!chdir("..")) //Move up a directory and start over - goto parse; + if (DL_LEN() == -1) //If we just popped root, + goto done; //we're done + lexer_pushtok(CLCLOSE, 0); //Else push "Close Directory" token, + ntok++; + if (!chdir("..")) //move up a directory and + goto scan; //start over } fprintf(stderr, ERR_DL); libfail: perror("parsedir"); fail: - exit(EXIT_FAILURE); + return -1; + done: + return ntok; } /* Directory Entity Sort and Filter (Dredge) @@ -158,14 +177,14 @@ int scanner Returns -1 if 'readdir' encounters an error, otherwise returns the number of directory entries sent to the external 'lexer_direntpa' array. */ -typedef +typedef //so we can typecast dirent's 'alphasort()' to take const void*s int (*qcomp)(const void*, const void*); static inline int dredge_current_depth #define READDIR_ERROR (-1) #define READDIR_DONE (0) -#define DPS_LEN() (direntpp - lexer_direntpa) -#define DPS_PUSH(E) (*direntpp++ = E) +#define DPS_LEN() (lexer_direntpp - lexer_direntpa) +#define DPS_PUSH(E) (*lexer_direntpp++ = E) () { struct dirent** direntpp = lexer_direntpa; DIR* cwd = DL_CURDIR(); @@ -178,7 +197,9 @@ int dredge_current_depth DPS_PUSH(direntp); goto scan_next; case DT_DIR: - DL_CD_PUSH(direntp); + if (*(direntp->d_name) == '.') //skip hidden files and relative dirs + goto scan_next; + DL_CD_PUSH(direntp); goto scan_next; case DT_UNKNOWN: warnx("unknown file %s: ignoring", direntp->d_name); @@ -192,3 +213,19 @@ int dredge_current_depth return DPS_LEN(); } + +/* Scan Pixels + Scans up to 'len' pixels from the current file into 'buf'. + Returns the number of pixels scanned from the file, or -1 on error. +*/ +int scanner_scanpixels +( int* buf, + int x +) +{ int pixels = 0; + //Open the current file if not yet open + //Identify file type + //Verify file contents and header + //Read pixels into buffer + return pixels; +}