Skip to content

Added fix for enca to exit 1 each time it prints 'unknown' #19. #76

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
nijel merged 1 commit into from
Jun 11, 2025
Merged

Added fix for enca to exit 1 each time it prints 'unknown' #19. #76

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
25 changes: 17 additions & 8 deletions src/enca.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static int process_file (EncaAnalyser an,
const char *fname);
static void dwim_libenca_options(EncaAnalyser an,
const File *file);
static void print_results (const char *fname,
static int print_results (const char *fname,
EncaAnalyser an,
EncaEncoding result,
int gerrno);
Expand Down Expand Up @@ -104,6 +104,7 @@ process_file(EncaAnalyser an,
static int utf8 = ENCA_CS_UNKNOWN;
static Buffer *buffer = NULL; /* persistent i/o buffer */
int ot_is_convert = (options.output_type == OTYPE_CONVERT);
int res = ERR_OK;

EncaEncoding result; /* the guessed encoding */
File *file; /* the processed file */
Expand Down Expand Up @@ -169,13 +170,12 @@ process_file(EncaAnalyser an,
}

/* Print results. */
print_results(file->name, an, result, enca_errno(an));
res = print_results(file->name, an, result, enca_errno(an));
if (result.charset == utf8)
double_utf8_chk(an, buffer->data, buffer->pos);

file_free(file);

return enca_charset_is_known(result.charset) ? EXIT_SUCCESS : EXIT_FAILURE;
return (res == ERR_OK) && enca_charset_is_known(result.charset) ? EXIT_SUCCESS : EXIT_FAILURE;
}

/*
Expand Down Expand Up @@ -210,13 +210,14 @@ dwim_libenca_options(EncaAnalyser an, const File *file)
/**
* Prints results.
**/
static void
static int
print_results(const char *fname,
EncaAnalyser an,
EncaEncoding result,
int gerrno)
{
char *s;
int res = ERR_OK;
EncaSurface surf = result.surface
& ~enca_charset_natural_surface(result.charset);

Expand Down Expand Up @@ -258,22 +259,28 @@ print_results(const char *fname,
case OTYPE_CS2CS:
if (enca_charset_name(result.charset, ENCA_NAME_STYLE_CSTOCS) != NULL)
puts(enca_charset_name(result.charset, ENCA_NAME_STYLE_CSTOCS));
else
else {
puts(enca_charset_name(ENCA_CS_UNKNOWN, ENCA_NAME_STYLE_CSTOCS));
res = ERR_CANNOT;
}
break;

case OTYPE_ICONV:
if (enca_charset_name(result.charset, ENCA_NAME_STYLE_ICONV) != NULL)
puts(enca_charset_name(result.charset, ENCA_NAME_STYLE_ICONV));
else
else {
puts(enca_charset_name(ENCA_CS_UNKNOWN, ENCA_NAME_STYLE_ICONV));
res = ERR_CANNOT;
}
break;

case OTYPE_MIME:
if (enca_charset_name(result.charset, ENCA_NAME_STYLE_MIME) != NULL)
puts(enca_charset_name(result.charset, ENCA_NAME_STYLE_MIME));
else
else {
puts(enca_charset_name(ENCA_CS_UNKNOWN, ENCA_NAME_STYLE_MIME));
res = ERR_CANNOT;
}
break;

default:
Expand All @@ -283,7 +290,9 @@ print_results(const char *fname,

if (gerrno && options.output_type == OTYPE_DETAILS) {
printf(" Failure reason: %s.\n", enca_strerror(an, gerrno));
res = ERR_CANNOT;
}
return res;
}

/**
Expand Down
Loading