h/listfiles

@@ -23,14 +23,6 @@ Revision History:
 0.00  02-Jun-89  JSR  Created when routines separated from c.actionwind.
 */
 
-#ifndef __os_h
-#include "os.h"
-#endif
-
-#define ObjectType_NotFound   0
-#define ObjectType_File       1
-#define ObjectType_Directory  2
-
 typedef struct search_context *search_handle;
 
 /*
@@ -49,25 +41,25 @@ void deleted_next_node( search_handle, char * );
 /*
      Sets whether the search is recursive or not
 */
-extern void recurse_search_context( search_handle, int );
+extern void recurse_search_context( search_handle, BOOL );
 
 /*
      Sets whether directories should be returned before their contents.
      This is relevant only when recursing.
 */
-extern void return_directories_first( search_handle, int );
+extern void return_directories_first( search_handle, BOOL );
 
 /*
      Sets whether directories should be returned after their contents.
      This is relevant only when recursing.
 */
-extern void return_directories_last( search_handle, int );
+extern void return_directories_last( search_handle, BOOL );
 
 /*
      Sets whether partitions should be treated the same as directories or not.
      This is relevant only when recursing.
 */
-extern void treat_partitions_as_directories( search_handle, int );
+extern void treat_partitions_as_directories( search_handle, BOOL );
 
 /*
      Changes the directory throught which the search will take place
@@ -112,35 +104,35 @@ extern void read_next_node_parameters( search_handle );
      No node   -1
      Other     that given by filing system
 */
-extern unsigned int size_of_next_node( search_handle );
+extern uint32_t size_of_next_node( search_handle );
 
 /*
      Returns the reload address of the next node:
      No node   -1
      Other     that given by filing system
 */
-extern unsigned int reload_of_next_node( search_handle );
+extern int reload_of_next_node( search_handle );
 
 /*
      Returns the execution address of the next node:
      No node   -1
      Other     that given by filing system
 */
-extern unsigned int execute_of_next_node( search_handle );
+extern int execute_of_next_node( search_handle );
 
 /*
      Returns the attriibutes of the next node:
      No node   -1
      Other     that given by filing system
 */
-extern unsigned int attributes_of_next_node( search_handle );
+extern int attributes_of_next_node( search_handle );
 
 /*
      Returns the object type of the next node:
      No node   ObjectType_NotFound
      Other     that given by filing system
 */
-extern unsigned int objecttype_of_next_node( search_handle );
+extern int objecttype_of_next_node( search_handle );
 
 /*
      Returns the name of the next node:
@@ -153,13 +145,13 @@ extern char *name_of_next_node( search_handle );
         Assuming a directory has just been found, return whether this return
         of this directory was before or after its contents.
 */
-extern unsigned int directory_is_after_contents( search_handle );
+extern BOOL directory_is_after_contents( search_handle );
 
 /*
      returns non-0 if another node to come
      returns 0 if no more nodes
 */
-extern unsigned int another_node( search_handle );
+extern BOOL another_node( search_handle );
 
 /*
         When finding a selection fails call this to skip it.
@@ -171,9 +163,13 @@ extern void skip_failed_selection( search_handle );
 */
 extern void skip_list_file( search_handle );
 
-
 /*
      Step to the next node for return by next_filename.
 */
-extern os_error *step_to_next_node( search_handle );
+extern os_error *step_to_next_node( search_handle, uint32_t *progress );
 
+#ifdef USE_PROGRESS_BAR
+extern uint32_t progress_of_next_node( search_handle );
+extern void **chain_ref_ptr_of_next_node( search_handle );
+extern void listfiles_convert_to_copymove( search_handle handle );
+#endif

h/memmanage

@@ -21,29 +21,34 @@ Revision History:
 0.00  13-Jun-89  JSR  Created.
 */
 
-#ifndef __os_h
-#include "os.h"
-#endif
-
 /*
      For c.memmanage
 */
 extern void action_slot( int );
 extern os_error *init_memmanagement( void );
 extern os_error *init_for_copying( void );
-extern os_error *add_file_to_chain( char *dest, char *source, int size, int reload, int exec, int attr, int objtype, int force, int *full );
-extern os_error *read_a_block( int *i_am_full, int *need_another_file, int *that_finished_a_file );
-extern os_error *write_a_block( int *i_am_empty, int *that_finished_a_file );
+extern os_error *add_file_to_chain( char *dest, char *source,
+                                    uint32_t size, int reload, int exec, int attr, int objtype,
+                                    BOOL force, BOOL *full
+                                    #ifdef USE_PROGRESS_BAR
+                                    , uint32_t progress, void **ref
+                                    #endif
+                                  );
+extern os_error *read_a_block( BOOL *i_am_full, BOOL *need_another_file, BOOL *that_finished_a_file, uint32_t *progress);
+extern os_error *write_a_block( BOOL *i_am_empty, BOOL *that_finished_a_file, uint32_t *progress );
 extern char *next_file_to_be_written( void );
 extern char *next_file_to_be_read( void );
 extern void restart_file_read( void );
 extern void restart_file_write( void );
 extern void skip_file_read( void );
 extern void skip_file_write( void );
-extern int bytes_left_to_read( void );
-extern int bytes_left_to_write( void );
+extern uint32_t bytes_left_to_read( void );
+extern uint32_t bytes_left_to_write( void );
 extern void closedown_memmanagement( void );
-extern void copy_go_faster( int do_it );
-extern int size_of_finished_file;
-extern char *source_of_finished_file;
+extern void copy_go_faster( BOOL do_it );
+#ifdef USE_PROGRESS_BAR
+extern void modify_chain_file_progress( void *ref, uint32_t progress );
+#endif
 
+extern BOOL  finished_obj_was_file;
+extern char *finished_obj_source_name;