URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c22c060d2b60255f688c2aa9b6dcc63bdeea0031
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
c22c060 by Guy Harris (guy@xxxxxxxxxxxx):
Fix addition of extensions to file names.
If the file is to be compressed, then:
if the type in which the file is to be written has a set of extensions
it uses, leave the file name alone if it ends with one of those
extensions followed by the extension for the compression type,
otherwise append the default extension for that file type followed by
the extension for the compression type;
if it doesn't, leave the file name alone if it ends with the extension
for the compression type, otherwise append the extension for the
compression type;
otherwise:
if the type in which the file is to be written has a set of extensions
it uses, leave the file name alone if it ends with one of those
extensions, otherwise append the default extension for that file type followed by
the extension for the compression type;
if it doesn't, leave the file name alone if it ends with the extension
for the compression type, otherwise append the extension for the
compression type.
Change-Id: I7c4093af28cc30d579a2ae9faa8f4164b4764001
Reviewed-on: https://code.wireshark.org/review/30681
Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 204dc92 wiretap/merge.c: consolidate three similar merge_files routines
add c22c060 Fix addition of extensions to file names.
Summary of changes:
ui/qt/main_window.cpp | 95 ++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 71 insertions(+), 24 deletions(-)
