Merge branch 'rs/trace2-dst-warning'

Code cleanup.

* rs/trace2-dst-warning:
trace2: use warning() directly in tr2_dst_malformed_warning()

diff --combined trace2/tr2_dst.c
index 5dda0ca1cdb5d09a8cdfb27dd45d4436f3e8aa6f,6c425f17f3ca7a75c9b3a0c26dba50582672757a..c69857515fa5e5c0dcc937fc33b894058e04bcfb
--- 1/trace2/tr2_dst.c
--- 2/trace2/tr2_dst.c
+++ b/trace2/tr2_dst.c
@@@ -1,13 -1,14 +1,13 @@@
  #include "cache.h"
  #include "trace2/tr2_dst.h"
 +#include "trace2/tr2_sid.h"
  #include "trace2/tr2_sysenv.h"
  
  /*
 - * If a Trace2 target cannot be opened for writing, we should issue a
 - * warning to stderr, but this is very annoying if the target is a pipe
 - * or socket and beyond the user's control -- especially since every
 - * git command (and sub-command) will print the message.  So we silently
 - * eat these warnings and just discard the trace data.
 + * How many attempts we will make at creating an automatically-named trace file.
   */
 +#define MAX_AUTO_ATTEMPTS 10
 +
  static int tr2_dst_want_warning(void)
  {
        static int tr2env_dst_debug = -1;
@@@ -32,56 -33,6 +32,56 @@@ void tr2_dst_trace_disable(struct tr2_d
        dst->need_close = 0;
  }
  
 +static int tr2_dst_try_auto_path(struct tr2_dst *dst, const char *tgt_prefix)
 +{
 +      int fd;
 +      const char *last_slash, *sid = tr2_sid_get();
 +      struct strbuf path = STRBUF_INIT;
 +      size_t base_path_len;
 +      unsigned attempt_count;
 +
 +      last_slash = strrchr(sid, '/');
 +      if (last_slash)
 +              sid = last_slash + 1;
 +
 +      strbuf_addstr(&path, tgt_prefix);
 +      if (!is_dir_sep(path.buf[path.len - 1]))
 +              strbuf_addch(&path, '/');
 +      strbuf_addstr(&path, sid);
 +      base_path_len = path.len;
 +
 +      for (attempt_count = 0; attempt_count < MAX_AUTO_ATTEMPTS; attempt_count++) {
 +              if (attempt_count > 0) {
 +                      strbuf_setlen(&path, base_path_len);
 +                      strbuf_addf(&path, ".%d", attempt_count);
 +              }
 +
 +              fd = open(path.buf, O_WRONLY | O_CREAT | O_EXCL, 0666);
 +              if (fd != -1)
 +                      break;
 +      }
 +
 +      if (fd == -1) {
 +              if (tr2_dst_want_warning())
 +                      warning("trace2: could not open '%.*s' for '%s' tracing: %s",
 +                              (int) base_path_len, path.buf,
 +                              tr2_sysenv_display_name(dst->sysenv_var),
 +                              strerror(errno));
 +
 +              tr2_dst_trace_disable(dst);
 +              strbuf_release(&path);
 +              return 0;
 +      }
 +
 +      strbuf_release(&path);
 +
 +      dst->fd = fd;
 +      dst->need_close = 1;
 +      dst->initialized = 1;
 +
 +      return dst->fd;
 +}
 +
  static int tr2_dst_try_path(struct tr2_dst *dst, const char *tgt_value)
  {
        int fd = open(tgt_value, O_WRONLY | O_APPEND | O_CREAT, 0666);
@@@ -215,13 -166,8 +215,8 @@@ connected
  static void tr2_dst_malformed_warning(struct tr2_dst *dst,
                                      const char *tgt_value)
  {
-       struct strbuf buf = STRBUF_INIT;
- 
-       strbuf_addf(&buf, "trace2: unknown value for '%s': '%s'",
-                   tr2_sysenv_display_name(dst->sysenv_var), tgt_value);
-       warning("%s", buf.buf);
- 
-       strbuf_release(&buf);
+       warning("trace2: unknown value for '%s': '%s'",
+               tr2_sysenv_display_name(dst->sysenv_var), tgt_value);
  }
  
  int tr2_dst_get_trace_fd(struct tr2_dst *dst)
@@@ -252,12 -198,8 +247,12 @@@
                return dst->fd;
        }
  
 -      if (is_absolute_path(tgt_value))
 -              return tr2_dst_try_path(dst, tgt_value);
 +      if (is_absolute_path(tgt_value)) {
 +              if (is_directory(tgt_value))
 +                      return tr2_dst_try_auto_path(dst, tgt_value);
 +              else
 +                      return tr2_dst_try_path(dst, tgt_value);
 +      }
  
  #ifndef NO_UNIX_SOCKETS
        if (starts_with(tgt_value, PREFIX_AF_UNIX))