Fix mistakes in merge of widechar
Restore mistakenly deleted attr.c