comparison src/editfns.c @ 23213:3bfc1e9b0377

(emacs_memftime): New function. (Fformat_time_string): Use it to handle null bytes in formats correctly.

23212:42fcd022d4e5

      if (CONSP (low))
	low = Fcar (low);
      CHECK_NUMBER (low, 0);
      *result = (XINT (high) << 16) + (XINT (low) & 0xffff);
      return *result >> 16 == XINT (high);
    }
}

/*
DEFUN ("format-time-string", Fformat_time_string, Sformat_time_string, 1, 3, 0,

    {
      char *buf = (char *) alloca (size + 1);
      int result;

      buf[0] = '\1';
      result = emacs_strftime (buf, size, XSTRING (format_string)->data,
			       tm);
      if ((result > 0 && result < size) || (result == 0 && buf[0] == '\0'))
	return build_string (buf);

      /* If buffer was too small, make it bigger and try again.  */
      result = emacs_strftime (NULL, 0x7fffffff, XSTRING (format_string)->data,
			       tm);
      size = result + 1;
    }
}

23213:3bfc1e9b0377

      if (CONSP (low))
	low = Fcar (low);
      CHECK_NUMBER (low, 0);
      *result = (XINT (high) << 16) + (XINT (low) & 0xffff);
      return *result >> 16 == XINT (high);
    }
}

/* Write information into buffer S of size MAXSIZE, according to the
   FORMAT of length FORMAT_LEN, using time information taken from *TP.
   Return the number of bytes written, not including the terminating
   '\0'.  If S is NULL, nothing will be written anywhere; so to
   determine how many bytes would be written, use NULL for S and
   ((size_t) -1) for MAXSIZE.

   This function behaves like emacs_strftime, except it allows null
   bytes in FORMAT.  */
static size_t
emacs_memftime (s, maxsize, format, format_len, tp)
      char *s;
      size_t maxsize;
      const char *format;
      size_t format_len;
      const struct tm *tp;
{
  size_t total = 0;

  for (;;)
    {
      size_t len;
      size_t result;

      if (s)
	s[0] = '\1';

      result = emacs_strftime (s, maxsize, format, tp);

      if (s)
	{
	  if (result == 0 && s[0] != '\0')
	    return 0;
	  s += result + 1;
	}

      maxsize -= result + 1;
      total += result;
      len = strlen (format);
      if (len == format_len)
	return total;
      total++;
      format += len + 1;
      format_len -= len + 1;
    }
}

/*
DEFUN ("format-time-string", Fformat_time_string, Sformat_time_string, 1, 3, 0,

    {
      char *buf = (char *) alloca (size + 1);
      int result;

      buf[0] = '\1';
      result = emacs_memftime (buf, size, XSTRING (format_string)->data,
			       STRING_BYTES (XSTRING (format_string)),
			       tm);
      if ((result > 0 && result < size) || (result == 0 && buf[0] == '\0'))
	return make_string (buf, result);

      /* If buffer was too small, make it bigger and try again.  */
      result = emacs_memftime (NULL, (size_t) -1,
			       XSTRING (format_string)->data,
			       STRING_BYTES (XSTRING (format_string)),
			       tm);
      size = result + 1;
    }
}