Refactor more stuff

Author: veganaiZe

hd-tests.c

@@ -286,23 +286,17 @@ int
 test__create_horizontal_line__is_console_width(void)
 {
     /** Arrange */
-    CONSOLE_SCREEN_BUFFER_INFO csbi = {
-            80, 40,        /** buffer columns, rows */
-            0, 0,          /** cursor column, row */
-            14,            /** color attributes */
-            0, 0, 79, 39,  /** coords left, top, right, bottom */
-            0, 0           /** max window size */
-    };
-    size_t console_width = (size_t) csbi.srWindow.Right + 1;
+    struct console_info console_info;
     char line[8192] = { 0 };
-    size_t length = 0;
+    int length = 0;
 
     /** Act */
-    create_horizontal_line(line, csbi);
-    length = strlen(line);
+    get_console_info(&console_info);
+    create_horizontal_line(line, &console_info);
+    length = (int) strlen(line);
 
     /** Assert */
-    if (length != console_width) {
+    if (length != console_info.width) {
         printf("LINE %d: LENGTH OF LINE SHOULD MATCH CONSOLE WIDTH", __LINE__);
         return 1;
     }

hd.c

@@ -85,7 +85,7 @@ compact_size_with_suffix(double size_bytes, char * suffixed_size)
         if((size_bytes /= 1024) >= 1024)  /** MB */
             if((size_bytes /= 1024) >= 1024)  /** GB */
                 if((size_bytes /= 1024) >= 1024)  /** TB */
-                    sprintf(suffixed_size, "%lu TB", (unsigned long) (size_bytes/1024));
+                    sprintf(suffixed_size, "%lu TB", (unsigned long) (size_bytes/1024LU));
                 else sprintf(suffixed_size, "%u GB", (unsigned) size_bytes);
             else sprintf(suffixed_size, "%u MB", (unsigned) size_bytes);
         else sprintf(suffixed_size, "%u KB", (unsigned) size_bytes);
@@ -110,20 +110,16 @@ create_footer(char * footer_string, int console_width, char * root_path, char se
 
 
 char *
-create_horizontal_line(char * result, CONSOLE_SCREEN_BUFFER_INFO csbi)
+create_horizontal_line(char result[], struct console_info * console_info)
 {
-    SHORT i;
-    SHORT console_width = csbi.srWindow.Right + 1;
-    const char horizontal_line_character[] = { (char)196, '\0' };
+    int i = 0;
+    const char horizontal_line_character = (char) 196;
 
     /** Draw line in result string */
-    for(i = 0; i < console_width; ++i) {
-/*        //if (i == console_width / 2) {
-        //    strcat(string, "%c", );
-        //} else {
-*/            strncat(result, horizontal_line_character, 2);
-/*        //}*/
+    for(i = 0; i < console_info->width; ++i) {
+        result[i] = horizontal_line_character;
     }
+    result[i] = '\0';
 
     return result;
 }
@@ -135,7 +131,7 @@ display_footer(struct console_info * console_info)
     char line[8192] = { 0 };
 
     FG_AQUA();
-    create_horizontal_line(line, g_screen_info_t);
+    create_horizontal_line(line, console_info);
     printf("%s", line);
 
     FG_LIGHT_AQUA();
@@ -182,7 +178,7 @@ display_header(struct console_info * console_info, struct search_info * search_i
     printf("Path: %s\n", search_info->path);
 
     /** Draw horizontal line across screen */
-    create_horizontal_line(line, g_screen_info_t);
+    create_horizontal_line(line, console_info);
     printf("%s", line);
 
     return 0;

hd.h

@@ -65,8 +65,8 @@ struct console_info {
 
 struct search_info {
     enum sort_by sort_by;
-    char path[1024];
-    char pattern[1024];
+    char path[4096];
+    char pattern[4096];
     enum should_clear_screen should_clear_screen;
 };
 
@@ -75,7 +75,7 @@ int append_horizontal_line(char[], unsigned int);
 int build_initial_search_string(char * search_path, char * search_string);
 char * compact_size_with_suffix(double, char *);
 int create_footer(char *, int, char *, char);
-char * create_horizontal_line(char *, CONSOLE_SCREEN_BUFFER_INFO);
+char * create_horizontal_line(char *,  struct console_info *);
 int display_footer(struct console_info *);
 int display_header(struct console_info *, struct search_info *);
 int display_help(struct console_info *);

main.c

@@ -19,6 +19,7 @@ main(int argc, const char * argv[])
         display_help(&console_info);
         return 0;
     }
+    display_header(&console_info, &search_info);
 
 /*    char search_path[MAX_PATH] = { 0 };*/
 /*    char search_string[MAX_PATH] = { 0 };*/