cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0c342d1da1
openbsd-ports/devel/gindent/patches/patch-src_args_c
pvalchev 20135bc426 Update to gindent-2.2.8 
- Add KNF (-knf) option
- Enable BERKELEY option by default
- Use gettext port rather than building its own
From Jim Geovedi <jim@corebsd.or.id>, thanks!
2002-08-26 02:55:09 +00:00

192 lines
17 KiB
Plaintext
Raw Blame History

$OpenBSD: patch-src_args_c,v 1.1 2002/08/26 02:55:09 pvalchev Exp $
--- src/args.c.orig Fri Mar 15 14:48:45 2002
+++ src/args.c Fri Aug 23 06:00:16 2002
@@ -1,3 +1,5 @@
+#define BERKELEY_DEFAULTS 1
+
/* Copyright (c) 1999, 2000 Carlo Wood. All rights reserved.
* Copyright (c) 1994 Joseph Arceneaux. All rights reserved.
* Copyright (c) 1992 Free Software Foundation, Inc. All rights reserved.
@@ -113,6 +115,7 @@ static int exp_gnu = 0;
static int exp_hnl = 0;
static int exp_i = 0;
static int exp_ip = 0;
+static int exp_knf = 0;
static int exp_kr = 0;
static int exp_l = 0;
static int exp_lc = 0;
@@ -179,6 +182,30 @@ typedef struct pro
* variable must share the explicit flag. */
} pro_ty;
+#define BSD_PRO_SETTINGS {"orig", PRO_SETTINGS, 0, ONOFF_NA,\
+ (int *) "-nbap\0-nbad\0-bbo\0-hnl\0-bc\0-br\0-brs\0-c33\0-cd33\0-cdb\0-ce\0\
+-ci4\0-cli0\0-cp33\0-di16\0-fc1\0-fca\0-i4\0-l75\0-lp\0-npcs\0-nprs\0-psl\0\
+-sc\0-sai\0-saf\0-saw\0-nsob\0-nss\0-ts8\0",\
+ &exp_orig}
+
+#define KNF_PRO_SETTINGS {"knf", PRO_SETTINGS, 0, ONOFF_NA,\
+ (int *) "-bad\0-bap\0-nbbb\0-nbc\0-bbo\0-br\0-brs\0-nbs\0-c33\0-cd33\0-cdb\0\
+-ce\0-ci4\0-cli0\0-cp33\0-ncs\0-d0\0-di0\0-ndj\0-nfc1\0-nfca\0-hnl\0-i8\0-ip8\0\
+-l79\0-nlp\0-npcs\0-nprs\0-psl\0-sai\0-saf\0-saw\0-sc\0-nsob\0-nss\0",\
+ &exp_knf}
+
+#define KR_PRO_SETTINGS {"kr", PRO_SETTINGS, 0, ONOFF_NA,\
+ (int *) "-nbad\0-bap\0-nbc\0-bbo\0-hnl\0-br\0-brs\0-c33\0-cd33\0\
+-ncdb\0-ce\0-ci4\0-cli0\0-d0\0-di1\0-nfc1\0-i4\0-ip0\0-l75\0-lp\0-npcs\0\
+-nprs\0-npsl\0-sai\0-saf\0-saw\0-cs\0-nsc\0-nsob\0-nfca\0-cp33\0-nss\0",\
+ &exp_kr}
+
+#define GNU_PRO_SETTINGS {"gnu", PRO_SETTINGS, 0, ONOFF_NA,\
+ (int *) "-nbad\0-bap\0-bbo\0-hnl\0-nbc\0-bl\0-bls\0-ncdb\0-cs\0-nce\0-di2\0\
+-ndj\0-nfc1\0-i2\0-ip5\0-lp\0-pcs\0-nprs\0-psl\0-nsc\0-sai\0-saf\0-saw\0\
+-nsob\0-bli2\0-cp1\0-nfca\0",\
+ &exp_gnu}
+
#ifdef BERKELEY_DEFAULTS
/* Settings for original defaults */
const pro_ty pro[] =
@@ -202,60 +229,63 @@ const pro_ty pro[] =
#endif
{"pi", PRO_INT, -1, ONOFF_NA, &settings.paren_indent, &exp_pi},
{"pcs", PRO_BOOL, false, ON, &settings.proc_calls_space, &exp_pcs},
+ BSD_PRO_SETTINGS,
{"o", PRO_BOOL, false, ON, &settings.expect_output_file, &exp_o},
{"nv", PRO_BOOL, false, OFF, &settings.verbose, &exp_v},
- {"nut", PRO_BOOL, true, OFF, &settings.use_tabs, &exp_ut},
- {"nss", PRO_BOOL, false, OFF, &settings.space_sp_semicolon, &exp_ss},
- {"nsob", PRO_BOOL, false, OFF, &settings.swallow_optional_blanklines, &exp_sob},
- {"nsc", PRO_BOOL, true, OFF, &settings.star_comment_cont, &exp_sc},
- {"nsaw", PRO_BOOL, true, OFF, &settings.space_after_while, &exp_saw},
- {"nsai", PRO_BOOL, true, OFF, &settings.space_after_if, &exp_sai},
- {"nsaf", PRO_BOOL, true, OFF, &settings.space_after_for, &exp_saf},
- {"npsl", PRO_BOOL, true, OFF, &settings.procnames_start_line, &exp_psl},
- {"nprs", PRO_BOOL, false, OFF, &settings.parentheses_space, &exp_prs},
+ {"nut", PRO_BOOL, false, OFF, &settings.use_tabs, &exp_ut},
+ {"nss", PRO_BOOL, true, OFF, &settings.space_sp_semicolon, &exp_ss},
+ {"nsob", PRO_BOOL, true, OFF, &settings.swallow_optional_blanklines, &exp_sob},
+ {"nsc", PRO_BOOL, false, OFF, &settings.star_comment_cont, &exp_sc},
+ {"nsaw", PRO_BOOL, false, OFF, &settings.space_after_while, &exp_saw},
+ {"nsai", PRO_BOOL, false, OFF, &settings.space_after_if, &exp_sai},
+ {"nsaf", PRO_BOOL, false, OFF, &settings.space_after_for, &exp_saf},
+ {"npsl", PRO_BOOL, false, OFF, &settings.procnames_start_line, &exp_psl},
+ {"nprs", PRO_BOOL, true, OFF, &settings.parentheses_space, &exp_prs},
{"npro", PRO_IGN, 0, ONOFF_NA, 0, &exp_pro},
#ifdef PRESERVE_MTIME
{"npmt", PRO_BOOL, false, OFF, &settings.preserve_mtime, &exp_pmt},
#endif
- {"npcs", PRO_BOOL, false, OFF, &settings.proc_calls_space, &exp_pcs},
+ {"npcs", PRO_BOOL, true, OFF, &settings.proc_calls_space, &exp_pcs},
{"nlps", PRO_BOOL, false, OFF, &settings.leave_preproc_space, &exp_lps},
{"nlp", PRO_BOOL, true, OFF, &settings.lineup_to_parens, &exp_lp},
{"nip", PRO_SETTINGS, 0, ONOFF_NA, (int *) "-ip0", &exp_nip},
- {"nhnl", PRO_BOOL, true, OFF, &settings.honour_newlines, &exp_hnl},
+ {"nhnl", PRO_BOOL, false, OFF, &settings.honour_newlines, &exp_hnl},
{"nfca", PRO_BOOL, true, OFF, &settings.format_comments, &exp_fca},
{"nfc1", PRO_BOOL, true, OFF, &settings.format_col1_comments, &exp_fc1},
{"neei", PRO_BOOL, false, OFF, &settings.extra_expression_indent, &exp_eei},
- {"ndj", PRO_BOOL, false, OFF, &settings.ljust_decl, &exp_dj},
- {"ncs", PRO_BOOL, true, OFF, &settings.cast_space, &exp_cs},
- {"nce", PRO_BOOL, true, OFF, &settings.cuddle_else, &exp_ce},
+ {"ndj", PRO_BOOL, true, OFF, &settings.ljust_decl, &exp_dj},
+ {"ncs", PRO_BOOL, false, OFF, &settings.cast_space, &exp_cs},
+ {"nce", PRO_BOOL, false, OFF, &settings.cuddle_else, &exp_ce},
{"ncdw", PRO_BOOL, false, OFF, &settings.cuddle_do_while, &exp_cdw},
- {"ncdb", PRO_BOOL, true, OFF, &settings.comment_delimiter_on_blankline, &exp_cdb},
+ {"ncdb", PRO_BOOL, false, OFF, &settings.comment_delimiter_on_blankline, &exp_cdb},
{"nbs", PRO_BOOL, false, OFF, &settings.blank_after_sizeof, &exp_bs},
{"nbfda", PRO_BOOL, false, OFF, &settings.break_function_decl_args, &exp_bfda},
{"nbc", PRO_BOOL, true, ON, &settings.leave_comma, &exp_bc},
- {"nbbo", PRO_BOOL, true, OFF, &settings.break_before_boolean_operator, &exp_bbo},
- {"nbbb", PRO_BOOL, false, OFF, &settings.blanklines_before_blockcomments, &exp_bbb},
+ {"nbbo", PRO_BOOL, false, OFF, &settings.break_before_boolean_operator, &exp_bbo},
+ {"nbbb", PRO_BOOL, true, OFF, &settings.blanklines_before_blockcomments, &exp_bbb},
{"nbap", PRO_BOOL, false, OFF, &settings.blanklines_after_procs, &exp_bap},
{"nbadp", PRO_BOOL, false, OFF, &settings.blanklines_after_declarations_at_proctop, &exp_badp},
{"nbad", PRO_BOOL, false, OFF, &settings.blanklines_after_declarations, &exp_bad},
{"nbacc", PRO_BOOL, false, OFF, &settings.blanklines_around_conditional_compilation, &exp_bacc},
{"lps", PRO_BOOL, false, ON, &settings.leave_preproc_space, &exp_lps},
- {"lp", PRO_BOOL, true, ON, &settings.lineup_to_parens, &exp_lp},
+ {"lp", PRO_BOOL, false, ON, &settings.lineup_to_parens, &exp_lp},
{"lc", PRO_INT, DEFAULT_RIGHT_COMMENT_MARGIN, ONOFF_NA, &settings.comment_max_col, &exp_lc},
{"l", PRO_INT, DEFAULT_RIGHT_MARGIN, ONOFF_NA, &settings.max_col, &exp_l},
- {"kr", PRO_SETTINGS, 0, ONOFF_NA, KR_SETTINGS_STRING, &exp_kr},
- {"ip", PRO_INT, 4, ONOFF_NA, &settings.indent_parameters, &exp_ip},
- {"i", PRO_INT, 4, ONOFF_NA, &settings.ind_size, &exp_i},
+ KR_PRO_SETTINGS,
+/* This is now the default. */
+ KNF_PRO_SETTINGS,
+ {"ip", PRO_INT, 8, ONOFF_NA, &settings.indent_parameters, &exp_ip},
+ {"i", PRO_INT, 8, ONOFF_NA, &settings.ind_size, &exp_i},
{"hnl", PRO_BOOL, true, ON, &settings.honour_newlines, &exp_hnl},
{"h", PRO_FUNCTION, 0, ONOFF_NA, (int *) usage, &exp_version},
- {"gnu", PRO_SETTINGS, 0, ONOFF_NA, GNU_SETTINGS_STRING, &exp_gnu},
- {"fca", PRO_BOOL, true, ON, &settings.format_comments, &exp_fca},
- {"fc1", PRO_BOOL, true, ON, &settings.format_col1_comments, &exp_fc1},
+ GNU_PRO_SETTINGS,
+ {"fca", PRO_BOOL, false, ON, &settings.format_comments, &exp_fca},
+ {"fc1", PRO_BOOL, false, ON, &settings.format_col1_comments, &exp_fc1},
{"eei", PRO_BOOL, false, ON, &settings.extra_expression_indent, &exp_eei},
{"dj", PRO_BOOL, false, ON, &settings.ljust_decl, &exp_dj},
- {"di", PRO_INT, 16, ONOFF_NA, &settings.decl_indent, &exp_di},
+ {"di", PRO_INT, 0, ONOFF_NA, &settings.decl_indent, &exp_di},
{"d", PRO_INT, 0, ONOFF_NA, &settings.unindent_displace, &exp_d},
- {"cs", PRO_BOOL, true, ON, &settings.cast_space, &exp_cs},
+ {"cs", PRO_BOOL, false, ON, &settings.cast_space, &exp_cs},
{"cp", PRO_INT, 33, ONOFF_NA, &settings.else_endif_col, &exp_cp},
{"cli", PRO_INT, 0, ONOFF_NA, &settings.case_indent, &exp_cli},
{"ci", PRO_INT, 4, ONOFF_NA, &settings.continuation_indent, &exp_ci},
@@ -273,12 +303,12 @@ const pro_ty pro[] =
{"bli", PRO_INT, 0, ONOFF_NA, &settings.brace_indent, &exp_bli},
{"bl", PRO_BOOL, true, OFF, &settings.btype_2, &exp_bl},
{"bfda", PRO_BOOL, false, ON, &settings.break_function_decl_args, &exp_bfda},
- {"bc", PRO_BOOL, true, OFF, &settings.leave_comma, &exp_bc},
+ {"bc", PRO_BOOL, false, OFF, &settings.leave_comma, &exp_bc},
{"bbo", PRO_BOOL, true, ON, &settings.break_before_boolean_operator, &exp_bbo},
{"bbb", PRO_BOOL, false, ON, &settings.blanklines_before_blockcomments, &exp_bbb},
- {"bap", PRO_BOOL, false, ON, &settings.blanklines_after_procs, &exp_bap},
- {"badp", PRO_BOOL, false, ON, &settings.blanklines_after_declarations_at_proctop, &exp_badp},
- {"bad", PRO_BOOL, false, ON, &settings.blanklines_after_declarations, &exp_bad},
+ {"bap", PRO_BOOL, true, ON, &settings.blanklines_after_procs, &exp_bap},
+ {"badp", PRO_BOOL, true, ON, &settings.blanklines_after_declarations_at_proctop, &exp_badp},
+ {"bad", PRO_BOOL, true, ON, &settings.blanklines_after_declarations, &exp_bad},
{"bacc", PRO_BOOL, false, ON, &settings.blanklines_around_conditional_compilation, &exp_bacc},
{"T", PRO_KEY, 0, ONOFF_NA, 0, &exp_T},
/* Signify end of structure. */
@@ -309,7 +339,7 @@ const pro_ty pro[] =
#endif
{"pi", PRO_INT, -1, ONOFF_NA, &settings.paren_indent, &exp_pi},
{"pcs", PRO_BOOL, true, ON, &settings.proc_calls_space, &exp_pcs},
- {"orig", PRO_SETTINGS, 0, ONOFF_NA, ORIG_SETTINGS_STRING, &exp_orig},
+ BSD_PRO_SETTINGS,
{"o", PRO_BOOL, false, ON, &settings.expect_output_file, &exp_o},
{"nv", PRO_BOOL, false, OFF, &settings.verbose, &exp_v},
{"nut", PRO_BOOL, true, OFF, &settings.use_tabs, &exp_ut},
@@ -351,13 +381,14 @@ const pro_ty pro[] =
{"lp", PRO_BOOL, true, ON, &settings.lineup_to_parens, &exp_lp},
{"lc", PRO_INT, DEFAULT_RIGHT_COMMENT_MARGIN, ONOFF_NA, &settings.comment_max_col, &exp_lc},
{"l", PRO_INT, DEFAULT_RIGHT_MARGIN, ONOFF_NA, &settings.max_col, &exp_l},
- {"kr", PRO_SETTINGS, 0, ONOFF_NA, KR_SETTINGS_STRING, &exp_kr},
+ KR_PRO_SETTINGS,
+ KNF_PRO_SETTINGS,
{"ip", PRO_INT, 5, ONOFF_NA, &settings.indent_parameters, &exp_ip},
{"i", PRO_INT, 2, ONOFF_NA, &settings.ind_size, &exp_i},
{"hnl", PRO_BOOL, true, ON, &settings.honour_newlines, &exp_hnl},
{"h", PRO_FUNCTION, 0, ONOFF_NA, (int *) usage, &exp_version},
/* This is now the default. */
- {"gnu", PRO_SETTINGS, 0, ONOFF_NA, GNU_SETTINGS_STRING, &exp_gnu},
+ GNU_PRO_SETTINGS,
{"fca", PRO_BOOL, false, ON, &settings.format_comments, &exp_fca},
{"fc1", PRO_BOOL, false, ON, &settings.format_col1_comments, &exp_fc1},
{"eei", PRO_BOOL, false, ON, &settings.extra_expression_indent, &exp_eei},
@@ -507,6 +538,9 @@ const long_option_conversion_ty option_c
{"blank-lines-after-declarations", "bad"},
{"blank-lines-after-commas", "bc"},
{"blank-before-sizeof", "bs"},
+ {"berkeley-kernel-style", "knf"},
+ {"berkeley-kernel-normal-form", "knf"},
+ {"kernel-normal-form", "knf"},
{"berkeley-style", "orig"},
{"berkeley", "orig"},
{"Bill-Shannon", "bs"},
Reference in New Issue View Git Blame Copy Permalink