yaffs_importer has had more command line options added.
see README_yaffs_import_py.txt for more infomation.
Signed-off-by: Timothy Manning <tfhmanning@gmail.com>
flags:
-d [number]
set the debugging message level.
flags:
-d [number]
set the debugging message level.
- that debug level 0 will always be printed unless debug_level is set to -1
level 0 error messages
level 1 basic tasks are shown(creating, deleating,ect)(this is set as the
default and is recommended)
level 0 error messages
level 1 basic tasks are shown(creating, deleating,ect)(this is set as the
default and is recommended)
level 4 is used for bug hunting and shows each step and in detail
-ignore_hidden_directories
will not copy hidden (./) directories if used.
level 4 is used for bug hunting and shows each step and in detail
-ignore_hidden_directories
will not copy hidden (./) directories if used.
+
+ -o [yaffs_path]
+ chooses the path where the branch will be copyied into yaffs.
+ note this path must start with "/yaffs2/"
+ example: python yaffs_importer.py /home/timothy/work/yaffs/yaffs_importer_test_dir -o /yaffs2/apple/
-Deleating files and folders
+ -yaffs_trace [number]
+ this sets the yaffs_trace() function with the number inputed.
+ this number must be in the range of char.
+ yaffs_importer saves the current yaffs_trace value and restores the value after the branch has been imported.
+ setting this flag to -1 will run yaffs_importer with the default yaffs_trace value.
+
+Deleting files and folders
to deleate files and folders in yaffs use the yaffs_browser (the documentation still needs to be written).
to run the browser use this: "python yaffs_browser"
to deleate a file or a folder select the file or folder then go
Edit->Delete selected.
Clear Yaffs
to deleate files and folders in yaffs use the yaffs_browser (the documentation still needs to be written).
to run the browser use this: "python yaffs_browser"
to deleate a file or a folder select the file or folder then go
Edit->Delete selected.
Clear Yaffs
- the easiest way to clear yaffs of all files and folders is to remove
+ the easiest way to clear the yaffs file system of all files and folders is to remove
the emfile-2k-0 file. this file is stored in the
yaffs2/direct/python/ folder.
the emfile-2k-0 file. this file is stored in the
yaffs2/direct/python/ folder.
- the command is: rm emfile-2k-0
\ No newline at end of file
+ the command is: rm emfile-2k-0
#import examples
import ctypes
#import examples
import ctypes
yaffs_mount("/yaffs2/")
root_window =tk.Tk()
root_window.title("YAFFS Browser")
yaffs_mount("/yaffs2/")
root_window =tk.Tk()
root_window.title("YAFFS Browser")
debug_message( ("unknown object in snapshot:", unknown_in_snapshot[i]), 0)
debug_message( ("unknown object in snapshot:", unknown_in_snapshot[i]), 0)
-def import_into_yaffs(file_path, yaffs_path="/yaffs2/", debug_level=1, copy_hidden_dir=True ,new_yaffs_trace_val=0 ):
+def import_into_yaffs(file_path, yaffs_path="/yaffs2/", debug_level=1, copy_hidden_dir=True ,new_yaffs_trace_val=-1 ):
# global current_debug_level
# global search_hidden_directories
# global yaffs_root_dir_path
# global current_debug_level
# global search_hidden_directories
# global yaffs_root_dir_path
# yaffs_root_dir_path=yaffs_path
# path=file_path
old_yaffs_trace_val=yaffs_get_trace()
# yaffs_root_dir_path=yaffs_path
# path=file_path
old_yaffs_trace_val=yaffs_get_trace()
- yaffs_set_trace(new_yaffs_trace_val)
+ if new_yaffs_trace_val!=-1:
+ yaffs_set_trace(new_yaffs_trace_val)
data=scan_dir(file_path, copy_hidden_dir)
copy_scanned_files_into_yaffs(data[0], data[1], data[2], data[3],file_path, yaffs_path)
data=scan_dir(file_path, copy_hidden_dir)
copy_scanned_files_into_yaffs(data[0], data[1], data[2], data[3],file_path, yaffs_path)
# absolute_path = os.path.abspath(os.path.curdir)
#print "absolute path:", absolute_path
current_debug_level=1
search_hidden_directories=True
# absolute_path = os.path.abspath(os.path.curdir)
#print "absolute path:", absolute_path
current_debug_level=1
search_hidden_directories=True
- yaffs_root_dir_path="/yaffs2/scanning/"
+ yaffs_root_dir_path="/yaffs2/"
+ yaffs_trace=-1
#print sys.argv
path=sys.argv[1]
for i in range(2, len(sys.argv)):
#print sys.argv
path=sys.argv[1]
for i in range(2, len(sys.argv)):
current_debug_level=int( sys.argv[i+1])
if sys.argv[i]=="-ignore_hidden_directories":
search_hidden_directories=False
current_debug_level=int( sys.argv[i+1])
if sys.argv[i]=="-ignore_hidden_directories":
search_hidden_directories=False
+ if sys.argv[i]=="-o":
+ yaffs_root_dir_path=sys.argv[i+1]
+ if sys.argv[i]=="-yaffs_trace":
+ yaffs_trace=int(sys.argv[i+1])
#
#
# path="/home/timothy/work/yaffs/git/yaffs2"
# path="/home/timothy/my_stuff/old_laptop/timothy/programming_lejos/"
#
#
# path="/home/timothy/work/yaffs/git/yaffs2"
# path="/home/timothy/my_stuff/old_laptop/timothy/programming_lejos/"
- import_into_yaffs(path, yaffs_root_dir_path, current_debug_level, search_hidden_directories, 0 )
+ import_into_yaffs(path, yaffs_root_dir_path, current_debug_level, search_hidden_directories, yaffs_trace )
# scan_dir(path)
# copy_scanned_files_into_yaffs()
#print_scanned_dir_list()
# scan_dir(path)
# copy_scanned_files_into_yaffs()
#print_scanned_dir_list()
add_to_buffer(message_buffer, "error##########",MESSAGE_LEVEL_ERROR);
add_to_buffer(message_buffer, error_message,MESSAGE_LEVEL_ERROR);
add_to_buffer(message_buffer, "error_code",MESSAGE_LEVEL_ERROR);
add_to_buffer(message_buffer, "error##########",MESSAGE_LEVEL_ERROR);
add_to_buffer(message_buffer, error_message,MESSAGE_LEVEL_ERROR);
add_to_buffer(message_buffer, "error_code",MESSAGE_LEVEL_ERROR);
- printf("%d\n",yaffs_get_error());
+ if (MESSAGE_LEVEL_ERROR<=DEBUG_LEVEL) printf("%d\n",yaffs_get_error()); /*cannot yet add int types to buffer. this is a quick fix*/
//print_buffer(message_buffer,PRINT_ALL);
//print_buffer(message_buffer,PRINT_ALL);
#include "message_buffer.h"
#include "message_buffer.h"
-void add_to_buffer(buffer *p_Buffer, char message[],char message_level){
+void add_to_buffer(buffer *p_Buffer, char *message,char message_level){
+ /*move the head up one. the head always points at the last written data*/
- printf("p_Buffer->tail=%d\n",p_Buffer->tail);
- printf("p_Buffer->head=%d\n",p_Buffer->head);
- if (p_Buffer->head >=BUFFER_SIZE) {
- printf("buffer overflow\n");
- p_Buffer->head -= BUFFER_SIZE; /*wrap the head around the buffer*/
- printf("new p_Buffer->head=%d\n",p_Buffer->head);
-
+// printf("p_Buffer->tail=%d\n",p_Buffer->tail);
+// printf("p_Buffer->head=%d\n",p_Buffer->head);
+ if (p_Buffer->head >=BUFFER_SIZE-1) {
+// printf("buffer overflow\n");
+ p_Buffer->head -= (BUFFER_SIZE-1); /*wrap the head around the buffer*/
+// printf("new p_Buffer->head=%d\n",p_Buffer->head);
+ }
/*if the buffer is full then delete last entry by moving the tail*/
if (p_Buffer->head==p_Buffer->tail){
/*if the buffer is full then delete last entry by moving the tail*/
if (p_Buffer->head==p_Buffer->tail){
- printf("moving buffer tail from %d to ",p_Buffer->tail);
+// printf("moving buffer tail from %d to ",p_Buffer->tail);
- printf("%d\n",p_Buffer->tail);
if (p_Buffer->tail >=BUFFER_SIZE) p_Buffer->tail -= BUFFER_SIZE;/*wrap the tail around the buffer*/
if (p_Buffer->tail >=BUFFER_SIZE) p_Buffer->tail -= BUFFER_SIZE;/*wrap the tail around the buffer*/
+// printf("%d\n",p_Buffer->tail);
+
- /*move the head up one. the head always points at the last written data*/
p_Buffer->message_level[p_Buffer->head]=message_level; /*copy the message level*/
x=p_Buffer->head;
p_Buffer->message_level[p_Buffer->head]=message_level; /*copy the message level*/
x=p_Buffer->head;
strcpy(p_Buffer->message[p_Buffer->head],message); /*copy the message*/
strcpy(p_Buffer->message[p_Buffer->head],message); /*copy the message*/
-/*
- //convert the message into a string so it can be printed cleanly
- if (message[length_of_message-1]!='\0') p_Buffer->message[p_Buffer->head][x+1]='\0';
-*/
+// printf("copied %s into p_Buffer->message[p_Buffer->head]: %s\n",message,p_Buffer->message[p_Buffer->head]);
+// printf("extra %s\n",p_Buffer->message[p_Buffer->head]);
+
if (p_Buffer->message_level[p_Buffer->head]<=DEBUG_LEVEL){
// printf("printing buffer 1\n");
if (p_Buffer->message_level[p_Buffer->head]<=DEBUG_LEVEL){
// printf("printing buffer 1\n");
- print_buffer(p_Buffer,1); /*if the debug level is higher enough then print the new message*/
+ /* the print buffer sfunction is not working this is just a quick fix*/
+// print_buffer(p_Buffer,1); /*if the debug level is higher enough then print the new message*/
+ printf("%s\n",p_Buffer->message[p_Buffer->head]);
}
}
void print_buffer(buffer *p_Buffer, int number_of_messages_to_print){
}
}
void print_buffer(buffer *p_Buffer, int number_of_messages_to_print){
-/* printf("print buffer\n");
+ int x=0;
+ int i=0;
+ printf("print buffer\n");
printf("buffer head:%d\n",p_Buffer->head);
printf("buffer tail:%d\n",p_Buffer->tail);
printf("buffer head:%d\n",p_Buffer->head);
printf("buffer tail:%d\n",p_Buffer->tail);
if (number_of_messages_to_print==PRINT_ALL) number_of_messages_to_print=BUFFER_SIZE;
// printf("number_of_messages_to_print=%d\n",number_of_messages_to_print);
if (number_of_messages_to_print==PRINT_ALL) number_of_messages_to_print=BUFFER_SIZE;
// printf("number_of_messages_to_print=%d\n",number_of_messages_to_print);
- for (i=0,x=p_Buffer->head; (x>=p_Buffer->tail) && (i<number_of_messages_to_print); i++, x--){
-// printf("printing bufer\n");
- //printf("x:%d\n",x);
- if (x<0) x = BUFFER_SIZE; /*wrap x around buffer*/
- printf("%s\n",p_Buffer->message[x]);
+ for (i=0,x=0; (x>=p_Buffer->tail) && (i<number_of_messages_to_print); i++, x--){
+// printf("printing buffer\n");
+// printf("x:%d\n",x);
+ if (x<0) x = BUFFER_SIZE-1; /*wrap x around buffer*/
+ printf("%s\n",p_Buffer->message[p_Buffer->head]);
+ printf("printed buffer\n");
}buffer;
#include "error_handler.h" /*include this for the debug level*/
}buffer;
#include "error_handler.h" /*include this for the debug level*/
-void add_to_buffer(buffer *p_Buffer, char message[],char message_level); /*code for buffer*/
+void add_to_buffer(buffer *p_Buffer, char *message,char message_level); /*code for buffer*/
void print_buffer(buffer *p_Buffer,int number_of_messages_to_print); /*print messages in the buffer*/
#endif
void print_buffer(buffer *p_Buffer,int number_of_messages_to_print); /*print messages in the buffer*/
#endif
- char yaffs_test_dir[]="/yaffs2/test_dir\0"; /*the path to the directory where all of the testing will take place*/
- char yaffs_mount_dir[]="/yaffs2/\0"; /*the path to the mount point which yaffs will mount*/
+ char yaffs_test_dir[] ="/yaffs2/test_dir"; /*the path to the directory where all of the testing will take place*/
+ char yaffs_mount_dir[]="/yaffs2/"; /*the path to the mount point which yaffs will mount*/
init(yaffs_test_dir,yaffs_mount_dir);
test(yaffs_test_dir);
init(yaffs_test_dir,yaffs_mount_dir);
test(yaffs_test_dir);
-void init(char yaffs_test_dir[],char yaffs_mount_dir[]){
+void init(char *yaffs_test_dir,char *yaffs_mount_dir){
/*these variables are already set to zero, but it is better not to take chances*/
message_buffer.head=0;
message_buffer.tail=0;
/*these variables are already set to zero, but it is better not to take chances*/
message_buffer.head=0;
message_buffer.tail=0;
- add_to_buffer(&message_buffer,"welcome to the yaffs tester\0",MESSAGE_LEVEL_BASIC_TASKS);/* print boot up message*/
+ add_to_buffer(&message_buffer,"welcome to the yaffs tester",MESSAGE_LEVEL_BASIC_TASKS);/* print boot up message*/
yaffs_start_up();
yaffs_mount(yaffs_mount_dir);
yaffs_start_up();
yaffs_mount(yaffs_mount_dir);
-void join_paths(char path1[],char path2[],char *new_path ){
- unsigned int i=0;
- unsigned int x=0;
- printf("strlen path1:%d\n",strlen(path1));
+void join_paths(char *path1,char *path2,char *new_path ){
+
+/* printf("strlen path1:%d\n",strlen(path1));
printf("strlen path2:%d\n",strlen(path2));
printf("path1; %s\n",path1);
printf("strlen path2:%d\n",strlen(path2));
printf("path1; %s\n",path1);
//add_to_buffer(&message_buffer, "joining paths\0",MESSAGE_LEVEL_BASIC_TASKS);
//add_to_buffer(&message_buffer, "joining paths\0",MESSAGE_LEVEL_BASIC_TASKS);
- char cat[10]="cat\0";
- strcat(cat,"dog\0");
add_to_buffer(&message_buffer,path1,MESSAGE_LEVEL_BASIC_TASKS);
add_to_buffer(&message_buffer, path2,MESSAGE_LEVEL_BASIC_TASKS);
if ( (path1[(sizeof(path1)/sizeof(char))-2]=='/') && path2[0]!='/') {
/*paths are compatiable. concatanate them. note -2 is because of \0*/
add_to_buffer(&message_buffer,path1,MESSAGE_LEVEL_BASIC_TASKS);
add_to_buffer(&message_buffer, path2,MESSAGE_LEVEL_BASIC_TASKS);
if ( (path1[(sizeof(path1)/sizeof(char))-2]=='/') && path2[0]!='/') {
/*paths are compatiable. concatanate them. note -2 is because of \0*/
+ strcat(new_path,path1);
+ strcat(new_path,path2);
//char new_path[(sizeof(path1)/sizeof(char))+(sizeof(path2)/sizeof(char))];
//char new_path[(sizeof(path1)/sizeof(char))+(sizeof(path2)/sizeof(char))];
- strcpy(new_path,strcat(path1,path2));
+ //strcpy(new_path,strcat(path1,path2));
//return new_path;
}
else if ((path1[(sizeof(path1)/sizeof(char))-2]!='/') && path2[0]=='/') {
/*paths are compatiable. concatanate them*/
//return new_path;
}
else if ((path1[(sizeof(path1)/sizeof(char))-2]!='/') && path2[0]=='/') {
/*paths are compatiable. concatanate them*/
+ strcat(new_path,path1);
+ strcat(new_path,path2);
//char new_path[(sizeof(path1)/sizeof(char))+(sizeof(path2)/sizeof(char))];
//char new_path[(sizeof(path1)/sizeof(char))+(sizeof(path2)/sizeof(char))];
- strcpy(new_path,strcat(path1,path2));
+ //strcpy(new_path,strcat(path1,path2));
//return new_path;
}
else if ((path1[(sizeof(path1)/sizeof(char))-2]!='/') && path2[0]!='/') {
//return new_path;
}
else if ((path1[(sizeof(path1)/sizeof(char))-2]!='/') && path2[0]!='/') {
strcat(new_path,path2);
//strcpy(new_path,strcat(path1,strcat("/\0",path2)));
strcat(new_path,path2);
//strcpy(new_path,strcat(path1,strcat("/\0",path2)));
-/* copy_array(path1,new_path,0,0);
+#if 0
+ copy_array(path1,new_path,0,0);
copy_array('\0',new_path,0,(sizeof(path1)/sizeof(char)));
copy_array(path2,new_path,0,(sizeof(path1)/sizeof(char))+1);
old method now trying to use copy_array
copy_array('\0',new_path,0,(sizeof(path1)/sizeof(char)));
copy_array(path2,new_path,0,(sizeof(path1)/sizeof(char))+1);
old method now trying to use copy_array
for (x=(sizeof(path1)/sizeof(char)) ,i=0 ;i<=(sizeof(path2)/sizeof(char));x++,i++){
new_path[x]=path2[i];
}
for (x=(sizeof(path1)/sizeof(char)) ,i=0 ;i<=(sizeof(path2)/sizeof(char));x++,i++){
new_path[x]=path2[i];
}
//return new_path;
}
else if ((path1[(sizeof(path1)/sizeof(char))-2]=='/') && path2[0]=='/') {
//return new_path;
}
else if ((path1[(sizeof(path1)/sizeof(char))-2]=='/') && path2[0]=='/') {
- /*need to remove a "/". */
+ /*need to remove a "/". */
+ /*yaffs does not mind the extra slash. */
//char new_path[(sizeof(path1)/sizeof(char))+(sizeof(path2)/sizeof(char))-1];
//char new_path[(sizeof(path1)/sizeof(char))+(sizeof(path2)/sizeof(char))-1];
- strcpy(new_path,strcat(path1,strncat("",path2,(sizeof(path1)/sizeof(char))-1)));
+
+ strcat(new_path,path1);
+ strcat(new_path,path2);
+ //strcpy(new_path,strcat(path1,strncat("",path2,(sizeof(path1)/sizeof(char))-1)));
//return new_path;
}
else{
//return new_path;
}
else{
-/*
-void copy_array(char from[],char *to, unsigned int from_offset,unsigned int to_offset){
- unsigned int x=0;
- for (x=0+from_offset; x<(sizeof(from)/sizeof(char));x++){
- //add_to_buffer(&message_buffer, x,MESSAGE_LEVEL_BASIC_TASKS);
- //add_to_buffer(&message_buffer,from[x],MESSAGE_LEVEL_BASIC_TASKS);
- printf("x=%d\n",x);
- printf("char in from: %c\n\n",from[x]);
-
- to[x+to_offset]=from[x];
- }
-}
-*/
-void test(char yaffs_test_dir[]){
+
+
+
+void test(char*yaffs_test_dir){
char output=0;
char name[MAX_FILE_NAME_SIZE+3 ]="apple\0";
char output=0;
char name[MAX_FILE_NAME_SIZE+3 ]="apple\0";
- char path[MAX_FILE_NAME_SIZE+strlen(yaffs_test_dir)];
+ char path[MAX_FILE_NAME_SIZE];
join_paths(yaffs_test_dir,name,path);
while(1)
{
join_paths(yaffs_test_dir,name,path);
while(1)
{
#define MAX_FILE_NAME_SIZE 51
#define MAX_FILE_NAME_SIZE 51
-void init(char yaffs_test_dir[],char yaffs_mount_dir[]); /*sets up yaffs and mounts yaffs */
-void test(char yaffs_test_dir[]); /*contains the test code*/
+void init(char *yaffs_test_dir,char *yaffs_mount_dir); /*sets up yaffs and mounts yaffs */
+void test(char *yaffs_test_dir); /*contains the test code*/
void generate_random_string(char *ptr); /*generates a random string of letters to be used for a name*/
void generate_random_string(char *ptr); /*generates a random string of letters to be used for a name*/
-void join_paths(char path1[],char path2[],char *newpath );
-void copy_array(char from[],char *to, unsigned int from_offset,unsigned int to_offset);
+void join_paths(char *path1,char *path2,char *newpath );
+void copy_array(char *from,char *to, unsigned int from_offset,unsigned int to_offset);
projects / yaffs2.git / commitdiff