lkl tools: cpfromfs: fix root directory copy #300
Conversation
| @@ -493,6 +493,9 @@ int copy_one(const char *src, const char *mpoint, const char *dst) | |||
| snprintf(dst_path, sizeof(dst_path), "%s", dst); | |||
| } | |||
|
|
|||
| if (strcmp(src, "/") == 0) | |||
There was a problem hiding this comment.
Is it worth handling "//" and other logically equivalent paths here? I don't expect to use them directly, but they can occasionally arise when someone uses programmatically generated paths.
There was a problem hiding this comment.
@copumpkin Good point. I think the equivalent regular expression [./]* should cover all cases. .. already works fine so we don't need consider it. Anything else?
| const char *c = src; | ||
|
|
||
| while (*c) { | ||
| if (*c != '.' && *c != '/') |
There was a problem hiding this comment.
Just FYI, this will match "../" and "/../../../....." and other nonsense like that too. That's why I phrased my original comment as a question, FWIW: not sure it's actually worth doing this accurately 😄
|
Sorry, haven't had a chance to test this yet, but the approach looks good code-wise! |
Currently copying the disk image root is broken:
cptofs -P 1 -t ext4 -i test.img ~/linux /
cpfromfs -P 1 -t ext4 -i test.img / ~/linuxcopy
leads to the following in ~/linuxcopy:
/home/ec2-user/linuxcopy
└── 0000fe01
├── linux
│ ├── arch
The problem is that basename("/mnt/0000fe01/") returns 0000fe01 where
we would expect /.
Fix that by making the root folder copy case special.
Reported-by: Dan Peebles <pumpkin@me.com>
Signed-off-by: Octavian Purdila <tavi@cs.pub.ro>
|
@copumpkin Pushed a new version, probably still has multiple holes in it :) but unless there is something really wrong with it, I think it is good enough. |
This fixes #295
This change is