r8405: update var.c from upstream