Subject to section 5804 (relating to effective date of sentence), no person subject to this part while being held for trial or the result of trial may be subjected to punishment or penalty other than arrest or confinement upon the charges pending against the person, nor shall the arrest or confinement imposed upon the person be any more rigorous than the circumstances required to insure the person's presence. The person may be subjected to minor punishment during that period for infractions of discipline.