Merge branch 'master' of github.com:urbit/urbit

This commit is contained in:
C. Guy Yarvin 2014-04-07 09:50:11 -07:00
commit a04a4df69e
3 changed files with 4 additions and 4 deletions

View File

@ -71,7 +71,7 @@
(set (make-local-variable 'comment-use-syntax) nil)
(set (make-local-variable 'comment-start-skip) "\\(::+\\)\\s *")
(set (make-local-variable 'font-lock-defaults) '(hoon-font-lock-keywords))
(set (make-local-variable 'indent-tabs-mode nil)) ;; tabs zutiefst verboten
(set (make-local-variable 'indent-tabs-mode) nil) ;; tabs zutiefst verboten
(set (make-local-variable 'indent-line-function) 'indent-relative)
(set (make-local-variable 'imenu-generic-expression)
hoon-imenu-generic-expression)

View File

@ -30,7 +30,7 @@
u2_chop(5, 0, len_w, 0, sal_r, a);
for ( i_w = 0; i_w < len_w; i_w++ ) {
*u2_at_ray(sal_r + i_w) &= u2_atom_word(b, i_w);
*u2_at_ray(sal_r + i_w) &= (i_w >= lnb_w) ? 0 : u2_atom_word(b, i_w);
}
return u2_rl_malt(wir_r, sal_r);
}

View File

@ -58,7 +58,7 @@ _unix_opendir(c3_c* pax_c)
static void
_unix_mkdir(c3_c* pax_c)
{
if ( 0 != mkdir(pax_c, 0755) ) {
if ( 0 != mkdir(pax_c, 0755) && EEXIST != errno) {
uL(fprintf(uH, "%s: %s\n", pax_c, strerror(errno)));
c3_assert(0);
}
@ -69,7 +69,7 @@ _unix_mkdir(c3_c* pax_c)
static void
_unix_unlink(c3_c* pax_c)
{
if ( 0 != unlink(pax_c) ) {
if ( 0 != unlink(pax_c) && ENOENT != errno) {
uL(fprintf(uH, "%s: %s\n", pax_c, strerror(errno)));
c3_assert(0);
}