2) is not right. 1) has two possible meanings, as you noted, but in actual usage the context would make it clear which one you mean, so there would be no problem with ambiguity. Moreover, the b) meaning is the one that would most often be heard today (in the US).
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.