diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2013-07-22 12:13:11 +0800 |
|---|---|---|
| committer | LAN-TW <lantw44@gmail.com> | 2013-07-22 12:13:11 +0800 |
| commit | b79b664a2452e00b89d79538da8412f3a252d36d (patch) | |
| tree | 48a6351cf51243371d49429a4975c0d5a2614546 | |
| parent | 7ed1dba65e15728dacacf5ef217c7fcf829f748b (diff) | |
| download | gsoc2013-epiphany-b79b664a2452e00b89d79538da8412f3a252d36d.tar gsoc2013-epiphany-b79b664a2452e00b89d79538da8412f3a252d36d.tar.gz gsoc2013-epiphany-b79b664a2452e00b89d79538da8412f3a252d36d.tar.bz2 gsoc2013-epiphany-b79b664a2452e00b89d79538da8412f3a252d36d.tar.lz gsoc2013-epiphany-b79b664a2452e00b89d79538da8412f3a252d36d.tar.xz gsoc2013-epiphany-b79b664a2452e00b89d79538da8412f3a252d36d.tar.zst gsoc2013-epiphany-b79b664a2452e00b89d79538da8412f3a252d36d.zip | |
Add .cpio check when removing the file extension
| -rw-r--r-- | autoarchive/autoar-extract.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/autoarchive/autoar-extract.c b/autoarchive/autoar-extract.c index c30d70c04..0206bf4b7 100644 --- a/autoarchive/autoar-extract.c +++ b/autoarchive/autoar-extract.c @@ -377,11 +377,10 @@ _g_filename_basename_remove_extension (const char *filename) return basename; } - if (dot_location - 4 > basename) { - if (strncmp (dot_location - 4, ".tar", 4) == 0) { - dot_location -= 4; - } - } + if (dot_location - 4 > basename && strncmp (dot_location - 4, ".tar", 4) == 0) + dot_location -= 4; + else if (dot_location - 5 > basename && strncmp (dot_location - 5, ".cpio", 5) == 0) + dot_location -= 5; *dot_location = '\0'; |