diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:42:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:42:04 +0100 |
| commit | e5373920525a82339b6818c2b9ffdcce81af2c1b (patch) | |
| tree | ec16d65801687debbab06a0bb9855ab962d1b51d /include | |
| parent | 4bdb250c9f40abcadd63a1eb86c9364c4ca9c0d7 (diff) | |
| parent | 1533521bff4121dcd8dc37ef34fd09fc6a5018fb (diff) | |
| download | barebox-e5373920525a82339b6818c2b9ffdcce81af2c1b.tar.gz barebox-e5373920525a82339b6818c2b9ffdcce81af2c1b.tar.xz | |
Merge branch 'for-next/commands'
Diffstat (limited to 'include')
| -rw-r--r-- | include/environment.h | 7 | ||||
| -rw-r--r-- | include/fs.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/environment.h b/include/environment.h index 4184977009..096c1697c4 100644 --- a/include/environment.h +++ b/include/environment.h @@ -75,9 +75,6 @@ int env_push_context(void); /* defaults to /dev/env0 */ extern char *default_environment_path; -int envfs_load(char *filename, char *dirname); -int envfs_save(char *filename, char *dirname); - int export(const char *); struct stat; @@ -86,6 +83,10 @@ int file_save_action(const char *, struct stat *, void *, int); #endif /* __BAREBOX__ */ +#define ENV_FLAG_NO_OVERWRITE (1 << 0) +int envfs_load(char *filename, char *dirname, unsigned flags); +int envfs_save(char *filename, char *dirname); + /* This part is used for the host and the target */ struct action_data { int fd; diff --git a/include/fs.h b/include/fs.h index 3d5714c1fb..8ff7300919 100644 --- a/include/fs.h +++ b/include/fs.h @@ -182,4 +182,6 @@ void automount_remove(const char *_path); int automount_add(const char *path, const char *cmd); void automount_print(void); +int unlink_recursive(const char *path, char **failedpath); + #endif /* __FS_H */ |