X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_unit_commands.c;h=53966d46a0c939ef897395f4ed7873e0999af0c9;hb=a9f812df2a5071517dd3bb30cc80378f2e3cbe06;hp=f1904299895c9bdea62c198c24d7afe9c275b6d6;hpb=b516a26231b16a26f37b56cb9a298a2d9e6c0e23;p=melted diff --git a/src/miracle/miracle_unit_commands.c b/src/miracle/miracle_unit_commands.c index f190429..53966d4 100644 --- a/src/miracle/miracle_unit_commands.c +++ b/src/miracle/miracle_unit_commands.c @@ -40,6 +40,7 @@ int miracle_load( command_argument cmd_arg ) char *filename = (char*) cmd_arg->argument; char fullname[1024]; int flush = 1; + char *service; if ( filename[0] == '!' ) { @@ -47,10 +48,25 @@ int miracle_load( command_argument cmd_arg ) filename ++; } - if ( strlen( cmd_arg->root_dir ) && filename[0] == '/' ) - filename++; + service = strchr( filename, ':' ); + if ( service != NULL ) + { + service = filename; + filename = strchr( service, ':' ); + *filename ++ = '\0'; + + if ( strlen( cmd_arg->root_dir ) && filename[0] == '/' ) + filename++; + + snprintf( fullname, 1023, "%s:%s%s", service, cmd_arg->root_dir, filename ); + } + else + { + if ( strlen( cmd_arg->root_dir ) && filename[0] == '/' ) + filename++; - snprintf( fullname, 1023, "%s%s", cmd_arg->root_dir, filename ); + snprintf( fullname, 1023, "%s%s", cmd_arg->root_dir, filename ); + } if (unit == NULL) return RESPONSE_INVALID_UNIT; @@ -106,7 +122,7 @@ int miracle_insert( command_argument cmd_arg ) char *filename = (char*) cmd_arg->argument; char fullname[1024]; - if ( filename[0] == '/' ) + if ( strlen( cmd_arg->root_dir ) && filename[0] == '/' ) filename++; snprintf( fullname, 1023, "%s%s", cmd_arg->root_dir, filename ); @@ -165,6 +181,20 @@ int miracle_clean( command_argument cmd_arg ) return RESPONSE_SUCCESS; } +int miracle_clear( command_argument cmd_arg ) +{ + miracle_unit unit = miracle_get_unit(cmd_arg->unit); + + if (unit == NULL) + return RESPONSE_INVALID_UNIT; + else + { + if ( miracle_unit_clear( unit ) != valerie_ok ) + return RESPONSE_BAD_FILE; + } + return RESPONSE_SUCCESS; +} + int miracle_move( command_argument cmd_arg ) { miracle_unit unit = miracle_get_unit(cmd_arg->unit); @@ -198,7 +228,7 @@ int miracle_append( command_argument cmd_arg ) char *filename = (char*) cmd_arg->argument; char fullname[1024]; - if ( filename[0] == '/' ) + if ( strlen( cmd_arg->root_dir ) && filename[0] == '/' ) filename++; snprintf( fullname, 1023, "%s%s", cmd_arg->root_dir, filename );