security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-08 12:44:23 +01:00
Code Activity

common: Simplify format_text.

Browse Source 
* common/stringhelp.c (format_text): Don't allow IN_PLACE formatting.
* common/stringhelp.h: Change the API with no IN_PLACE.
* common/t-stringhelp.c (test_format_text): Follow the change.
* g10/gpgcompose.c (show_help): Likewise.
* g10/tofu.c (format_conflict_msg_part1, ask_about_binding)
(show_statistics, show_warning): Likewise.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-04-12 14:47:30 +09:00
parent 7f9032d4a8
commit 7b4edf14bb
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/stringhelp.c
View File

@ -1443,11 +1443,10 @@ compare_version_strings (const char *my_version, const char *req_version)
/* Format a string so that it fits within about TARGET_COLS columns. /* Format a string so that it fits within about TARGET_COLS columns.
If IN_PLACE is 0, then TEXT is copied to a new buffer, which is TEXT_IN is copied to a new buffer, which is returned.
returned. Otherwise, TEXT is modified in place and returned.
Normally, target_cols will be 72 and max_cols is 80. */ Normally, target_cols will be 72 and max_cols is 80. */
char * char *
format_text (char *text, int in_place, int target_cols, int max_cols) format_text (const char *text_in, int target_cols, int max_cols)
{ {
const int do_debug = 0; const int do_debug = 0;
@ -1459,9 +1458,9 @@ format_text (char *text, int in_place, int target_cols, int max_cols)
char *last_space = NULL; char *last_space = NULL;
int last_space_cols = 0; int last_space_cols = 0;
int copied_last_space = 0; int copied_last_space = 0;
char *text;
if (! in_place) text = xstrdup (text_in);
text = xstrdup (text);
p = line = text; p = line = text;
while (1) while (1)

2
common/stringhelp.h
View File

@ -155,7 +155,7 @@ int split_fields (char *string, char **array, int arraysize);
int compare_version_strings (const char *my_version, const char *req_version); int compare_version_strings (const char *my_version, const char *req_version);
/* Format a string so that it fits within about TARGET_COLS columns. */ /* Format a string so that it fits within about TARGET_COLS columns. */
char *format_text (char *text, int in_place, int target_cols, int max_cols); char *format_text (const char *text, int target_cols, int max_cols);
/*-- mapstrings.c --*/ /*-- mapstrings.c --*/

2
common/t-stringhelp.c
View File

@ -885,7 +885,7 @@ test_format_text (void)
{ {
struct test *test = &tests[i]; struct test *test = &tests[i];
char *result = char *result =
format_text (test->input, 0, test->target_cols, test->max_cols); format_text (test->input, test->target_cols, test->max_cols);
if (strcmp (result, test->expected) != 0) if (strcmp (result, test->expected) != 0)
{ {
printf ("%s: Test #%d failed.\nExpected: '%s'\nResult: '%s'\n", printf ("%s: Test #%d failed.\nExpected: '%s'\nResult: '%s'\n",

2
g10/gpgcompose.c
View File

@ -305,7 +305,7 @@ show_help (struct option options[])
if (! option) if (! option)
space = 72; space = 72;
formatted = format_text (tmp, 0, space, space + 4); formatted = format_text (tmp, space, space + 4);
if (tmp != help) if (tmp != help)
xfree (tmp); xfree (tmp);

10
g10/tofu.c
View File

@ -1355,7 +1355,7 @@ format_conflict_msg_part1 (int policy, strlist_t conflict_set,
es_fputc (0, fp); es_fputc (0, fp);
if (es_fclose_snatch (fp, (void **)&tmpstr, NULL)) if (es_fclose_snatch (fp, (void **)&tmpstr, NULL))
log_fatal ("error snatching memory stream\n"); log_fatal ("error snatching memory stream\n");
text = format_text (tmpstr, 0, 72, 80); text = format_text (tmpstr, 72, 80);
es_free (tmpstr); es_free (tmpstr);
return text; return text;
@ -1913,7 +1913,7 @@ ask_about_binding (ctrl_t ctrl,
/* TRANSLATORS: Please translate the text found in the source /* TRANSLATORS: Please translate the text found in the source
* file below. We don't directly internationalize that text so * file below. We don't directly internationalize that text so
* that we can tweak it without breaking translations. */ * that we can tweak it without breaking translations. */
char *text = _("TOFU detected a binding conflict"); const char *text = _("TOFU detected a binding conflict");
char *textbuf; char *textbuf;
if (!strcmp (text, "TOFU detected a binding conflict")) if (!strcmp (text, "TOFU detected a binding conflict"))
{ {
@ -1926,7 +1926,7 @@ ask_about_binding (ctrl_t ctrl,
"attack! Before accepting this association, you should talk to or " "attack! Before accepting this association, you should talk to or "
"call the person to make sure this new key is legitimate."; "call the person to make sure this new key is legitimate.";
} }
textbuf = format_text (text, 0, 72, 80); textbuf = format_text (text, 72, 80);
es_fprintf (fp, "\n%s\n", textbuf); es_fprintf (fp, "\n%s\n", textbuf);
xfree (textbuf); xfree (textbuf);
} }
@ -3190,7 +3190,7 @@ show_statistics (tofu_dbs_t dbs,
es_fputc (0, fp); es_fputc (0, fp);
if (es_fclose_snatch (fp, (void **) &tmpmsg, NULL)) if (es_fclose_snatch (fp, (void **) &tmpmsg, NULL))
log_fatal ("error snatching memory stream\n"); log_fatal ("error snatching memory stream\n");
msg = format_text (tmpmsg, 0, 72, 80); msg = format_text (tmpmsg, 72, 80);
es_free (tmpmsg); es_free (tmpmsg);
/* Print a status line but suppress the trailing LF. /* Print a status line but suppress the trailing LF.
@ -3265,7 +3265,7 @@ show_warning (const char *fingerprint, strlist_t user_id_list)
strlist_length (user_id_list)), strlist_length (user_id_list)),
set_policy_command); set_policy_command);
text = format_text (tmpmsg, 0, 72, 80); text = format_text (tmpmsg, 72, 80);
xfree (tmpmsg); xfree (tmpmsg);
log_string (GPGRT_LOG_INFO, text); log_string (GPGRT_LOG_INFO, text);
xfree (text); xfree (text);