logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0005-Don-t-omit-second-operand-to-operator.patch (4117B)

    

  1. From e245f2d71d44d2a858517321a01d3ca71147042f Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sun, 7 Jul 2019 21:53:16 -0700
  4. Subject: [PATCH] Don't omit second operand to '?' operator
  6. ---
  7.  src/open.c    | 5 +++--
  8.  src/prctl.c   | 8 ++++----
  9.  src/strace.c  | 8 ++++----
  10.  src/strauss.c | 4 +++-
  11.  src/util.c    | 2 +-
  12.  5 files changed, 15 insertions(+), 12 deletions(-)
  14. diff --git a/src/open.c b/src/open.c
  15. index 6356c5831..df59ea999 100644
  16. --- a/src/open.c
  17. +++ b/src/open.c
  18. @@ -88,8 +88,9 @@ sprint_open_modes64(uint64_t flags)
  19.  	}
  20.  	*p = '\0';
  21.  
  22. -	return sprintflags_ex(outstr, open_mode_flags, flags, sep,
  23. -			      XLAT_STYLE_ABBREV) ?: outstr;
  24. +	str = sprintflags_ex(outstr, open_mode_flags, flags, sep,
  25. +			     XLAT_STYLE_ABBREV);
  26. +	return str ? str : outstr;
  27.  }
  28.  
  29.  const char *
  30. diff --git a/src/prctl.c b/src/prctl.c
  31. index dbabb3a18..712715b98 100644
  32. --- a/src/prctl.c
  33. +++ b/src/prctl.c
  34. @@ -98,10 +98,10 @@ sprint_sve_val(kernel_ulong_t arg, bool aux)
  35.  	if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
  36.  	{
  37.  		xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */",
  38. -			 arg, flags_str ?: "", flags_str ? "|" : "", vl);
  39. +			 arg, flags_str ? flags_str : "", flags_str ? "|" : "", vl);
  40.  	} else {
  41.  		xsprintf(out, "%s%s%#" PRI_klx,
  42. -			 flags_str ?: "", flags_str ? "|" : "", vl);
  43. +			 flags_str ? flags_str : "", flags_str ? "|" : "", vl);
  44.  	}
  45.  
  46.  	return out;
  47. @@ -134,10 +134,10 @@ sprint_sme_val(kernel_ulong_t arg, bool aux)
  48.  	if (!aux && flags && xlat_verbose(xlat_verbosity) == XLAT_STYLE_VERBOSE)
  49.  	{
  50.  		xsprintf(out, "%#" PRI_klx " /* %s%s%#" PRI_klx " */",
  51. -			 arg, flags_str ?: "", flags_str ? "|" : "", vl);
  52. +			 arg, flags_str ? flags_str : "", flags_str ? "|" : "", vl);
  53.  	} else {
  54.  		xsprintf(out, "%s%s%#" PRI_klx,
  55. -			 flags_str ?: "", flags_str ? "|" : "", vl);
  56. +			 flags_str ? flags_str : "", flags_str ? "|" : "", vl);
  57.  	}
  58.  
  59.  	return out;
  60. diff --git a/src/strace.c b/src/strace.c
  61. index 1a9d53bc8..9ac16c8c3 100644
  62. --- a/src/strace.c
  63. +++ b/src/strace.c
  64. @@ -2649,7 +2649,7 @@ init(int argc, char *argv[])
  65.  			break;
  66.  		case GETOPT_TS:
  67.  			tflag_long_set = true;
  68. -			if (parse_ts_arg(optarg ?: tflag_str))
  69. +			if (parse_ts_arg(optarg ? optarg : tflag_str))
  70.  				error_opt_arg(c, lopt, optarg);
  71.  			break;
  72.  		case 'T':
  73. @@ -2723,7 +2723,7 @@ init(int argc, char *argv[])
  74.  				error_opt_arg(c, lopt, optarg);
  75.  			break;
  76.  		case GETOPT_TIPS:
  77. -			if (parse_tips_arg(optarg ?: ""))
  78. +			if (parse_tips_arg(optarg ? optarg : ""))
  79.  				error_opt_arg(c, lopt, optarg);
  80.  			break;
  81.  		case GETOPT_ARGV0:
  82. @@ -2772,10 +2772,10 @@ init(int argc, char *argv[])
  83.  			qualify_kvm(optarg);
  84.  			break;
  85.  		case GETOPT_QUAL_QUIET:
  86. -			qualify_quiet(optarg ?: qflag_qual);
  87. +			qualify_quiet(optarg ? optarg : qflag_qual);
  88.  			break;
  89.  		case GETOPT_QUAL_DECODE_FD:
  90. -			qualify_decode_fd(optarg ?: yflag_qual);
  91. +			qualify_decode_fd(optarg ? optarg : yflag_qual);
  92.  			break;
  93.  		case GETOPT_QUAL_DECODE_PID:
  94.  			qualify_decode_pid(optarg);
  95. diff --git a/src/strauss.c b/src/strauss.c
  96. index bec85021b..5d49f950a 100644
  97. --- a/src/strauss.c
  98. +++ b/src/strauss.c
  99. @@ -367,6 +367,7 @@ print_totd(void)
  100.  	struct timeval tv;
  101.  	size_t id;
  102.  	size_t i;
  103. +	const char *tip;
  104.  
  105.  	if (printed || show_tips == TIPS_NONE)
  106.  		return;
  107. @@ -386,9 +387,10 @@ print_totd(void)
  108.  	for (i = 0; (i < MAX_TIP_LINES) && (tips_tricks_tweaks[id][i] ||
  109.  					    (i < (ARRAY_SIZE(tip_right) - 1)));
  110.  	     i++) {
  111. +		tip = tips_tricks_tweaks[id][i];
  112.  		fprintf(stderr, "%s%-*s%s%s\n",
  113.  			tip_left[MIN(i + 1, ARRAY_SIZE(tip_left) - 1)],
  114. -			w, tips_tricks_tweaks[id][i] ?: "",
  115. +			w, tip ? tip : "",
  116.  			tip_right[MIN(i + 1, ARRAY_SIZE(tip_right) - 1)],
  117.  			strauss[MIN(3 + i, strauss_lines - 1)]);
  118.  	}
  119. diff --git a/src/util.c b/src/util.c
  120. index ada3ba76a..a88dd008d 100644
  121. --- a/src/util.c
  122. +++ b/src/util.c
  123. @@ -640,7 +640,7 @@ printsocket(struct tcb *tcp, int fd, const char *path)
  124.  		return false;
  125.  
  126.  	const char *details = get_sockaddr_by_inode(tcp, fd, inode);
  127. -	print_string_in_angle_brackets(details ?: path);
  128. +	print_string_in_angle_brackets(details ? details : path);
  129.  
  130.  	return true;
  131.  }
  132. -- 
  133. 2.44.0