Skip to content

fix(cli): improve --etag-save error path handling (test 369) #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonwiggins merged 1 commit into from
Mar 28, 2026
Merged

fix(cli): improve --etag-save error path handling (test 369) #132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 66 additions & 38 deletions crates/urlx-cli/src/transfer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,39 +1018,52 @@ pub fn run(args: &[String]) -> ExitCode {
}

// --etag-save with bad path + --next: skip affected transfers (curl compat: test 369).
// curl prints a warning and skips the transfer, continuing with --next groups.
// curl tries to open the etag file upfront via fopen("ab"). If it fails, it prints
// a warning and skips the transfer, continuing with --next groups.
// For single-URL case without --next, the etag check in run() handles error 26 (test 370).
if opts.had_next {
if let Some(ref path) = opts.etag_save_file {
if let Some(parent) = std::path::Path::new(path).parent() {
if !parent.as_os_str().is_empty() && !parent.exists() && !opts.create_dirs {
eprintln!(
let bad_etag = if path == "-" {
false // stdout is always valid
} else {
// With --create-dirs, ensure parent directories exist first
if opts.create_dirs {
if let Some(parent) = std::path::Path::new(path).parent() {
if !parent.as_os_str().is_empty() && !parent.exists() {
let _ = std::fs::create_dir_all(parent);
}
}
}
// Try to open the file upfront (matches curl's fopen("ab") in etag_store)
std::fs::OpenOptions::new().create(true).append(true).open(path).is_err()
};
if bad_etag {
eprintln!(
"Warning: Failed creating file for saving etags: \"{path}\". Skip this transfer"
);
// Remove URLs from the first group (group 0 = the group with etag-save)
let first_group = opts.per_url_group.first().copied().unwrap_or(0);
let mut i = 0;
while i < opts.urls.len() {
if opts.per_url_group.get(i).copied().unwrap_or(0) == first_group {
let _ = opts.urls.remove(i);
let _ = opts.per_url_credentials.remove(i);
let _ = opts.per_url_ftp_methods.remove(i);
let _ = opts.per_url_easy.remove(i);
let _ = opts.per_url_upload_files.remove(i);
let _ = opts.per_url_group.remove(i);
let _ = opts.glob_values.remove(i);
if i < opts.output_files.len() {
let _ = opts.output_files.remove(i);
}
} else {
i += 1;
// Remove URLs from the first group (group 0 = the group with etag-save)
let first_group = opts.per_url_group.first().copied().unwrap_or(0);
let mut i = 0;
while i < opts.urls.len() {
if opts.per_url_group.get(i).copied().unwrap_or(0) == first_group {
let _ = opts.urls.remove(i);
let _ = opts.per_url_credentials.remove(i);
let _ = opts.per_url_ftp_methods.remove(i);
let _ = opts.per_url_easy.remove(i);
let _ = opts.per_url_upload_files.remove(i);
let _ = opts.per_url_group.remove(i);
let _ = opts.glob_values.remove(i);
if i < opts.output_files.len() {
let _ = opts.output_files.remove(i);
}
} else {
i += 1;
}
opts.etag_save_file = None;
// If no URLs left after removal, exit successfully
if opts.urls.is_empty() {
return ExitCode::SUCCESS;
}
}
opts.etag_save_file = None;
// If no URLs left after removal, exit successfully
if opts.urls.is_empty() {
return ExitCode::SUCCESS;
}
}
}
Expand Down Expand Up @@ -1702,23 +1715,38 @@ pub fn run(args: &[String]) -> ExitCode {
}
}

// --etag-save: validate/create directory before transfer
// --etag-save: validate the etag file can be created before transfer.
// curl tries fopen(path, "ab") upfront. If it fails, it prints a warning
// ("Failed creating file for saving etags"), skips the transfer, and if no
// transfer was performed at all, returns CURLE_READ_ERROR (26) with
// "no transfer performed" (curl compat: test 370).
if let Some(ref path) = opts.etag_save_file {
if let Some(parent) = std::path::Path::new(path).parent() {
if !parent.as_os_str().is_empty() && !parent.exists() {
if opts.create_dirs {
if let Err(e) = std::fs::create_dir_all(parent) {
if !opts.silent || opts.show_error {
eprintln!("curl: error creating directories for etag file: {e}");
if path != "-" {
// With --create-dirs, ensure parent directories exist first
if opts.create_dirs {
if let Some(parent) = std::path::Path::new(path).parent() {
if !parent.as_os_str().is_empty() && !parent.exists() {
if let Err(e) = std::fs::create_dir_all(parent) {
if !opts.silent || opts.show_error {
eprintln!("curl: error creating directories for etag file: {e}");
}
return ExitCode::FAILURE;
}
return ExitCode::FAILURE;
}
} else {
// curl returns CURLE_READ_ERROR (26) for bad etag-save path
// (curl compat: test 370)
return ExitCode::from(26);
}
}
// Try to open the file upfront (matches curl's fopen("ab") in etag_store)
let bad_etag =
std::fs::OpenOptions::new().create(true).append(true).open(path).is_err();
if bad_etag {
eprintln!(
"Warning: Failed creating file for saving etags: \"{path}\". Skip this transfer"
);
if !opts.silent || opts.show_error {
eprintln!("curl: (26) no transfer performed");
}
return ExitCode::from(26);
}
}
}

Expand Down
Loading